summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/includes/macpci.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mess/includes/macpci.h')
-rw-r--r--src/mess/includes/macpci.h142
1 files changed, 70 insertions, 72 deletions
diff --git a/src/mess/includes/macpci.h b/src/mess/includes/macpci.h
index c349a0ea388..b679aac90dc 100644
--- a/src/mess/includes/macpci.h
+++ b/src/mess/includes/macpci.h
@@ -16,8 +16,8 @@
#include "machine/ncr539x.h"
#include "sound/awacs.h"
-#define C7M (7833600)
-#define C15M (C7M*2)
+#define C7M (7833600)
+#define C15M (C7M*2)
#define MAC_SCREEN_NAME "screen"
#define MAC_539X_1_TAG "539x_1"
@@ -26,45 +26,45 @@
/* tells which model is being emulated (set by macxxx_init) */
enum model_t
{
- PCIMODEL_MAC_PM5200,
- PCIMODEL_MAC_PM6200,
- PCIMODEL_MAC_PM5300,
- PCIMODEL_MAC_PM7200,
- PCIMODEL_MAC_PM7500,
- PCIMODEL_MAC_PM8500,
- PCIMODEL_MAC_PM9500,
- PCIMODEL_MAC_PM7215,
- PCIMODEL_MAC_PM5260,
- PCIMODEL_MAC_PM5400,
- PCIMODEL_MAC_PM7600,
- PCIMODEL_MAC_PM8200,
- PCIMODEL_MAC_PM6300,
- PCIMODEL_MAC_PM6400,
- PCIMODEL_MAC_PM4400,
- PCIMODEL_MAC_PM5500,
- PCIMODEL_MAC_PM7220,
- PCIMODEL_MAC_PM7300,
- PCIMODEL_MAC_PM6500,
- PCIMODEL_MAC_PM8600,
- PCIMODEL_MAC_PM9600,
-
- PCIMODEL_MAC_20TH,
-
- PCIMODEL_MAC_G3_GOSSAMER,
- PCIMODEL_MAC_G3_ALLINONE,
-
- PCIMODEL_MAC_PB5x0PPC,
- PCIMODEL_MAC_PB1400,
- PCIMODEL_MAC_PB2300,
- PCIMODEL_MAC_PB2400,
- PCIMODEL_MAC_PB3400,
- PCIMODEL_MAC_PB5300,
-
- PCIMODEL_MAC_PBG3KANGA,
- PCIMODEL_MAC_PBG3WALLST1,
- PCIMODEL_MAC_PBG3WALLST2,
-
- PCIMODEL_MAC_PIPPIN, // Apple/Bandai Pippin
+ PCIMODEL_MAC_PM5200,
+ PCIMODEL_MAC_PM6200,
+ PCIMODEL_MAC_PM5300,
+ PCIMODEL_MAC_PM7200,
+ PCIMODEL_MAC_PM7500,
+ PCIMODEL_MAC_PM8500,
+ PCIMODEL_MAC_PM9500,
+ PCIMODEL_MAC_PM7215,
+ PCIMODEL_MAC_PM5260,
+ PCIMODEL_MAC_PM5400,
+ PCIMODEL_MAC_PM7600,
+ PCIMODEL_MAC_PM8200,
+ PCIMODEL_MAC_PM6300,
+ PCIMODEL_MAC_PM6400,
+ PCIMODEL_MAC_PM4400,
+ PCIMODEL_MAC_PM5500,
+ PCIMODEL_MAC_PM7220,
+ PCIMODEL_MAC_PM7300,
+ PCIMODEL_MAC_PM6500,
+ PCIMODEL_MAC_PM8600,
+ PCIMODEL_MAC_PM9600,
+
+ PCIMODEL_MAC_20TH,
+
+ PCIMODEL_MAC_G3_GOSSAMER,
+ PCIMODEL_MAC_G3_ALLINONE,
+
+ PCIMODEL_MAC_PB5x0PPC,
+ PCIMODEL_MAC_PB1400,
+ PCIMODEL_MAC_PB2300,
+ PCIMODEL_MAC_PB2400,
+ PCIMODEL_MAC_PB3400,
+ PCIMODEL_MAC_PB5300,
+
+ PCIMODEL_MAC_PBG3KANGA,
+ PCIMODEL_MAC_PBG3WALLST1,
+ PCIMODEL_MAC_PBG3WALLST2,
+
+ PCIMODEL_MAC_PIPPIN, // Apple/Bandai Pippin
};
@@ -82,22 +82,22 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_via1(*this, "via6522_0"),
- m_awacs(*this, "awacs"),
- m_cuda(*this, CUDA_TAG),
+ m_awacs(*this, "awacs"),
+ m_cuda(*this, CUDA_TAG),
m_ram(*this, RAM_TAG),
- m_screen(*this, MAC_SCREEN_NAME),
- m_539x_1(*this, MAC_539X_1_TAG),
- m_539x_2(*this, MAC_539X_2_TAG)
- { }
+ m_screen(*this, MAC_SCREEN_NAME),
+ m_539x_1(*this, MAC_539X_1_TAG),
+ m_539x_2(*this, MAC_539X_2_TAG)
+ { }
required_device<cpu_device> m_maincpu;
required_device<via6522_device> m_via1;
optional_device<awacs_device> m_awacs;
- required_device<cuda_device> m_cuda;
+ required_device<cuda_device> m_cuda;
required_device<ram_device> m_ram;
- optional_device<screen_device> m_screen;
- optional_device<ncr539x_device> m_539x_1;
- optional_device<ncr539x_device> m_539x_2;
+ optional_device<screen_device> m_screen;
+ optional_device<ncr539x_device> m_539x_1;
+ optional_device<ncr539x_device> m_539x_2;
virtual void machine_start();
virtual void machine_reset();
@@ -112,14 +112,14 @@ public:
UINT32 m_rbv_colors[3], m_rbv_count, m_rbv_clutoffs, m_rbv_immed10wr;
UINT32 m_rbv_palette[256];
UINT8 m_sonora_vctl[8];
- emu_timer *m_vbl_timer, *m_cursor_timer;
- UINT16 m_cursor_line;
- UINT16 m_dafb_int_status;
- int m_dafb_scsi1_drq, m_dafb_scsi2_drq;
- UINT8 m_dafb_mode;
- UINT32 m_dafb_base, m_dafb_stride;
-
- // this is shared among all video setups with vram
+ emu_timer *m_vbl_timer, *m_cursor_timer;
+ UINT16 m_cursor_line;
+ UINT16 m_dafb_int_status;
+ int m_dafb_scsi1_drq, m_dafb_scsi2_drq;
+ UINT8 m_dafb_mode;
+ UINT32 m_dafb_base, m_dafb_stride;
+
+ // this is shared among all video setups with vram
UINT32 *m_vram;
// defined in machine/mac.c
@@ -135,26 +135,26 @@ public:
DECLARE_READ32_MEMBER(mac_read_id);
- DECLARE_READ8_MEMBER(mac_5396_r);
- DECLARE_WRITE8_MEMBER(mac_5396_w);
+ DECLARE_READ8_MEMBER(mac_5396_r);
+ DECLARE_WRITE8_MEMBER(mac_5396_w);
- DECLARE_WRITE_LINE_MEMBER(irq_539x_1_w);
- DECLARE_WRITE_LINE_MEMBER(drq_539x_1_w);
+ DECLARE_WRITE_LINE_MEMBER(irq_539x_1_w);
+ DECLARE_WRITE_LINE_MEMBER(drq_539x_1_w);
- DECLARE_WRITE_LINE_MEMBER(cuda_reset_w);
- DECLARE_WRITE_LINE_MEMBER(cuda_adb_linechange_w);
+ DECLARE_WRITE_LINE_MEMBER(cuda_reset_w);
+ DECLARE_WRITE_LINE_MEMBER(cuda_adb_linechange_w);
- // hack functions
+ // hack functions
DECLARE_READ64_MEMBER ( unk1_r );
DECLARE_READ64_MEMBER ( unk2_r );
DECLARE_DRIVER_INIT(pippin);
private:
- // wait states for accessing the VIA
- int m_via_cycles;
+ // wait states for accessing the VIA
+ int m_via_cycles;
- // hack
- UINT16 m_unk1_test;
+ // hack
+ UINT16 m_unk1_test;
public:
emu_timer *m_scanline_timer;
@@ -169,5 +169,3 @@ public:
};
#endif /* PCIMAC_H_ */
-
-