diff options
Diffstat (limited to 'src/mame/drivers/seattle.cpp')
-rw-r--r-- | src/mame/drivers/seattle.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp index d53f4c9994c..e8150277365 100644 --- a/src/mame/drivers/seattle.cpp +++ b/src/mame/drivers/seattle.cpp @@ -1871,7 +1871,7 @@ INPUT_PORTS_END MACHINE_CONFIG_START(seattle_state::seattle_common) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3) + MCFG_DEVICE_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK) @@ -1894,8 +1894,8 @@ MACHINE_CONFIG_START(seattle_state::seattle_common) MCFG_VOODOO_PCI_FBMEM(2) MCFG_VOODOO_PCI_TMUMEM(4, 0) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") - MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", seattle_state, vblank_assert)) - MCFG_VOODOO_STALL_CB(DEVWRITELINE(PCI_ID_GALILEO, gt64xxx_device, pci_stall)) + MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, seattle_state, vblank_assert)) + MCFG_VOODOO_STALL_CB(WRITELINE(PCI_ID_GALILEO, gt64xxx_device, pci_stall)) MCFG_NVRAM_ADD_1FILL("nvram") @@ -1912,7 +1912,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::phoenixsa) seattle_common(config); - MCFG_CPU_REPLACE("maincpu", R4700LE, SYSTEM_CLOCK*2) + MCFG_DEVICE_REPLACE("maincpu", R4700LE, SYSTEM_CLOCK*2) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK) @@ -1925,7 +1925,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::seattle150) seattle_common(config); - MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*3) + MCFG_DEVICE_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*3) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK) @@ -1935,13 +1935,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::seattle150_widget) seattle150(config); MCFG_SMC91C94_ADD("ethernet") - MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt)) + MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ethernet_interrupt)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::seattle200) seattle_common(config); - MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) + MCFG_DEVICE_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK) @@ -1951,12 +1951,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::seattle200_widget) seattle200(config); MCFG_SMC91C94_ADD("ethernet") - MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt)) + MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ethernet_interrupt)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::flagstaff) seattle_common(config); - MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) + MCFG_DEVICE_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK) @@ -1965,7 +1965,7 @@ MACHINE_CONFIG_START(seattle_state::flagstaff) MCFG_GT64XXX_SET_CS(3, seattle_state::seattle_flagstaff_cs3_map) MCFG_SMC91C94_ADD("ethernet") - MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt)) + MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ethernet_interrupt)) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO) MCFG_VOODOO_PCI_FBMEM(2) @@ -1984,7 +1984,7 @@ MACHINE_CONFIG_START(seattle_state::wg3dh) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD) MCFG_MIDWAY_IOASIC_UPPER(310/* others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END @@ -1998,35 +1998,35 @@ MACHINE_CONFIG_START(seattle_state::mace) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_MACE) MCFG_MIDWAY_IOASIC_UPPER(319/* others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::sfrush) flagstaff(config); MCFG_DEVICE_ADD("cage", ATARI_CAGE_SEATTLE, 0) MCFG_ATARI_CAGE_SPEEDUP(0x5236) - MCFG_ATARI_CAGE_IRQ_CALLBACK(DEVWRITE8("ioasic",midway_ioasic_device,cage_irq_handler)) + MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8("ioasic",midway_ioasic_device,cage_irq_handler)) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD) MCFG_MIDWAY_IOASIC_UPPER(315/* no alternates */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(100) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) - MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(seattle_state, wheel_board_w)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, seattle_state, wheel_board_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::sfrushrk) flagstaff(config); MCFG_DEVICE_ADD("cage", ATARI_CAGE_SEATTLE, 0) MCFG_ATARI_CAGE_SPEEDUP(0x5329) - MCFG_ATARI_CAGE_IRQ_CALLBACK(DEVWRITE8("ioasic",midway_ioasic_device,cage_irq_handler)) + MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8("ioasic",midway_ioasic_device,cage_irq_handler)) MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_SFRUSHRK) MCFG_MIDWAY_IOASIC_UPPER(331/* unknown */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(100) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) - MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(seattle_state, wheel_board_w)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, seattle_state, wheel_board_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::sfrushrkw) @@ -2045,7 +2045,7 @@ MACHINE_CONFIG_START(seattle_state::calspeed) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CALSPEED) MCFG_MIDWAY_IOASIC_UPPER(328/* others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(100) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END @@ -2059,7 +2059,7 @@ MACHINE_CONFIG_START(seattle_state::vaportrx) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_VAPORTRX) MCFG_MIDWAY_IOASIC_UPPER(324/* 334? unknown */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(100) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::biofreak) @@ -2072,7 +2072,7 @@ MACHINE_CONFIG_START(seattle_state::biofreak) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD) MCFG_MIDWAY_IOASIC_UPPER(231/* no alternates */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::blitz) @@ -2085,7 +2085,7 @@ MACHINE_CONFIG_START(seattle_state::blitz) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99) MCFG_MIDWAY_IOASIC_UPPER(444/* or 528 */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::blitz99) @@ -2098,7 +2098,7 @@ MACHINE_CONFIG_START(seattle_state::blitz99) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99) MCFG_MIDWAY_IOASIC_UPPER(481/* or 484 or 520 */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::blitz2k) @@ -2111,7 +2111,7 @@ MACHINE_CONFIG_START(seattle_state::blitz2k) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99) MCFG_MIDWAY_IOASIC_UPPER(494/* or 498 */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::carnevil) @@ -2124,7 +2124,7 @@ MACHINE_CONFIG_START(seattle_state::carnevil) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CARNEVIL) MCFG_MIDWAY_IOASIC_UPPER(469/* 469 or 486 or 528 */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END MACHINE_CONFIG_START(seattle_state::hyprdriv) @@ -2137,7 +2137,7 @@ MACHINE_CONFIG_START(seattle_state::hyprdriv) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_HYPRDRIV) MCFG_MIDWAY_IOASIC_UPPER(469/* unknown */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq)) MACHINE_CONFIG_END /************************************* |