diff options
Diffstat (limited to 'src/mame/drivers/vegas.cpp')
-rw-r--r-- | src/mame/drivers/vegas.cpp | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 365ce816a1a..a2cff296ca7 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -1721,7 +1721,7 @@ void vegas_state::vegas_cs8_map(address_map &map) MACHINE_CONFIG_START(vegas_state::vegascore) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", R5000LE, vegas_state::SYSTEM_CLOCK*2) + MCFG_DEVICE_ADD(m_maincpu, R5000LE, vegas_state::SYSTEM_CLOCK*2) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK) @@ -1739,21 +1739,21 @@ MACHINE_CONFIG_START(vegas_state::vegascore) MCFG_VRC5074_SET_CS(7, vegas_state::vegas_cs7_map) MCFG_IDE_PCI_ADD(PCI_ID_IDE, 0x10950646, 0x05, 0x0) - MCFG_IDE_PCI_IRQ_HANDLER(DEVWRITELINE(PCI_ID_NILE, vrc5074_device, pci_intr_d)) + MCFG_IDE_PCI_IRQ_HANDLER(WRITELINE(PCI_ID_NILE, vrc5074_device, pci_intr_d)) //MCFG_IDE_PCI_SET_PIF(0x8f) MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_2, ":maincpu") MCFG_VOODOO_PCI_FBMEM(2) MCFG_VOODOO_PCI_TMUMEM(4, 4) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") - MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", vegas_state, vblank_assert)) + MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert)) - MCFG_M48T37_ADD("timekeeper") - MCFG_M48T37_RESET_HANDLER(WRITELINE(vegas_state, watchdog_reset)) - MCFG_M48T37_IRQ_HANDLER(WRITELINE(vegas_state, watchdog_irq)) + MCFG_M48T37_ADD(m_timekeeper) + MCFG_M48T37_RESET_HANDLER(WRITELINE(*this, vegas_state, watchdog_reset)) + MCFG_M48T37_IRQ_HANDLER(WRITELINE(*this, vegas_state, watchdog_irq)) - MCFG_SMC91C94_ADD("ethernet") - MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(vegas_state, ethernet_interrupt)) + MCFG_SMC91C94_ADD(m_ethernet) + MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ethernet_interrupt)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1774,8 +1774,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::vegas250) vegascore(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_CLOCK(vegas_state::SYSTEM_CLOCK*2.5) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_CLOCK(vegas_state::SYSTEM_CLOCK*2.5) MACHINE_CONFIG_END @@ -1792,13 +1792,13 @@ MACHINE_CONFIG_START(vegas_state::vegasban) MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_BANSHEE, ":maincpu") MCFG_VOODOO_PCI_FBMEM(16) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") - MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", vegas_state, vblank_assert)) + MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert)) MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::vegasv3) vegas32m(config); - MCFG_CPU_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5) + MCFG_DEVICE_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK) @@ -1807,13 +1807,13 @@ MACHINE_CONFIG_START(vegas_state::vegasv3) MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_3, ":maincpu") MCFG_VOODOO_PCI_FBMEM(16) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") - MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", vegas_state, vblank_assert)) + MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert)) MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::denver) vegascore(config); - MCFG_CPU_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5) + MCFG_DEVICE_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5) MCFG_MIPS3_ICACHE_SIZE(16384) MCFG_MIPS3_DCACHE_SIZE(16384) MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK) @@ -1826,34 +1826,34 @@ MACHINE_CONFIG_START(vegas_state::denver) MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_3, ":maincpu") MCFG_VOODOO_PCI_FBMEM(16) MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo") - MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", vegas_state, vblank_assert)) + MCFG_VOODOO_VBLANK_CB(WRITELINE(":", vegas_state, vblank_assert)) // TL16C552 UART - MCFG_DEVICE_ADD("uart1", NS16550, vegas_state::SYSTEM_CLOCK / 12) - MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("ttys01", rs232_port_device, write_txd)) - MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("ttys01", rs232_port_device, write_dtr)) - MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("ttys01", rs232_port_device, write_rts)) - MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", vegas_state, duart_irq_cb)) - - MCFG_DEVICE_ADD("uart2", NS16550, vegas_state::SYSTEM_CLOCK / 12) - MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("ttys02", rs232_port_device, write_txd)) - MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("ttys02", rs232_port_device, write_dtr)) - MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("ttys02", rs232_port_device, write_rts)) - MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", vegas_state, duart_irq_cb)) - - MCFG_RS232_PORT_ADD("ttys01", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, rx_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dcd_w)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dsr_w)) - MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, ri_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, cts_w)) - - MCFG_RS232_PORT_ADD("ttys02", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, rx_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dcd_w)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dsr_w)) - MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, ri_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, cts_w)) + MCFG_DEVICE_ADD(m_uart1, NS16550, vegas_state::SYSTEM_CLOCK / 12) + MCFG_INS8250_OUT_TX_CB(WRITELINE("ttys01", rs232_port_device, write_txd)) + MCFG_INS8250_OUT_DTR_CB(WRITELINE("ttys01", rs232_port_device, write_dtr)) + MCFG_INS8250_OUT_RTS_CB(WRITELINE("ttys01", rs232_port_device, write_rts)) + MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, vegas_state, duart_irq_cb)) + + MCFG_DEVICE_ADD(m_uart2, NS16550, vegas_state::SYSTEM_CLOCK / 12) + MCFG_INS8250_OUT_TX_CB(WRITELINE("ttys02", rs232_port_device, write_txd)) + MCFG_INS8250_OUT_DTR_CB(WRITELINE("ttys02", rs232_port_device, write_dtr)) + MCFG_INS8250_OUT_RTS_CB(WRITELINE("ttys02", rs232_port_device, write_rts)) + MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, vegas_state, duart_irq_cb)) + + MCFG_DEVICE_ADD("ttys01", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, rx_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, dcd_w)) + MCFG_RS232_DSR_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, dsr_w)) + MCFG_RS232_RI_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, ri_w)) + MCFG_RS232_CTS_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, cts_w)) + + MCFG_DEVICE_ADD("ttys02", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, rx_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, dcd_w)) + MCFG_RS232_DSR_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, dsr_w)) + MCFG_RS232_RI_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, ri_w)) + MCFG_RS232_CTS_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, cts_w)) MACHINE_CONFIG_END @@ -1865,11 +1865,11 @@ MACHINE_CONFIG_START(vegas_state::gauntleg) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CALSPEED) MCFG_MIDWAY_IOASIC_UPPER(340/* 340=39", 322=27", others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END @@ -1879,11 +1879,11 @@ MACHINE_CONFIG_START(vegas_state::gauntdl) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_GAUNTDL) MCFG_MIDWAY_IOASIC_UPPER(346/* 347, others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END @@ -1893,11 +1893,11 @@ MACHINE_CONFIG_START(vegas_state::warfa) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_MACE) MCFG_MIDWAY_IOASIC_UPPER(337/* others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END @@ -1907,11 +1907,11 @@ MACHINE_CONFIG_START(vegas_state::tenthdeg) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_GAUNTDL) MCFG_MIDWAY_IOASIC_UPPER(330/* others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END @@ -1921,11 +1921,11 @@ MACHINE_CONFIG_START(vegas_state::roadburn) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0ddd) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD) MCFG_MIDWAY_IOASIC_UPPER(325/* others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END @@ -1935,14 +1935,14 @@ MACHINE_CONFIG_START(vegas_state::nbashowt) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_MACE) // 528 494 478 development pic, 487 NBA MCFG_MIDWAY_IOASIC_UPPER(487/* or 478 or 487 */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) //MCFG_MIDWAY_IOASIC_AUTO_ACK(1) - MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w)) + MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, i40_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::nbanfl) @@ -1950,13 +1950,13 @@ MACHINE_CONFIG_START(vegas_state::nbanfl) MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99) MCFG_MIDWAY_IOASIC_UPPER(498/* or 478 or 487 */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) //MCFG_MIDWAY_IOASIC_AUTO_ACK(1) - MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w)) + MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, i40_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::nbagold) @@ -1965,13 +1965,13 @@ MACHINE_CONFIG_START(vegas_state::nbagold) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_GAUNTDL) MCFG_MIDWAY_IOASIC_UPPER( 494 /* 494 109 ??? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) //MCFG_MIDWAY_IOASIC_AUTO_ACK(1) - MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w)) + MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, i40_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::sf2049) @@ -1980,13 +1980,13 @@ MACHINE_CONFIG_START(vegas_state::sf2049) MCFG_DCS2_AUDIO_DRAM_IN_MB(8) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x872) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD) MCFG_MIDWAY_IOASIC_UPPER(336/* others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) - MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w)) + MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, wheel_board_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::sf2049se) @@ -1995,13 +1995,13 @@ MACHINE_CONFIG_START(vegas_state::sf2049se) MCFG_DCS2_AUDIO_DRAM_IN_MB(8) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x872) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_SFRUSHRK) MCFG_MIDWAY_IOASIC_UPPER(352/*352 336 others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) - MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w)) + MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, wheel_board_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::sf2049te) @@ -2010,13 +2010,13 @@ MACHINE_CONFIG_START(vegas_state::sf2049te) MCFG_DCS2_AUDIO_DRAM_IN_MB(8) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x872) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_SFRUSHRK) MCFG_MIDWAY_IOASIC_UPPER(348/* 348 others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) MCFG_MIDWAY_IOASIC_AUTO_ACK(1) - MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w)) + MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, wheel_board_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(vegas_state::cartfury) @@ -2025,12 +2025,12 @@ MACHINE_CONFIG_START(vegas_state::cartfury) MCFG_DCS2_AUDIO_DRAM_IN_MB(4) MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d) - MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0) + MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0) MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CARNEVIL) // 433, 495 Development PIC MCFG_MIDWAY_IOASIC_UPPER(495/*433, 495 others? */) MCFG_MIDWAY_IOASIC_YEAR_OFFS(80) - MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq)) + MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq)) //MCFG_MIDWAY_IOASIC_AUTO_ACK(1) MACHINE_CONFIG_END |