diff options
Diffstat (limited to 'src/mame/drivers/super6.cpp')
-rw-r--r-- | src/mame/drivers/super6.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp index 6b790a64be7..c92460a2ed5 100644 --- a/src/mame/drivers/super6.cpp +++ b/src/mame/drivers/super6.cpp @@ -480,9 +480,9 @@ void super6_state::machine_reset() MACHINE_CONFIG_START(super6_state::super6) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(24'000'000)/4) - MCFG_CPU_PROGRAM_MAP(super6_mem) - MCFG_CPU_IO_MAP(super6_io) + MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(24'000'000)/4) + MCFG_DEVICE_PROGRAM_MAP(super6_mem) + MCFG_DEVICE_IO_MAP(super6_io) MCFG_Z80_DAISY_CHAIN(super6_daisy_chain) // devices @@ -493,43 +493,43 @@ MACHINE_CONFIG_START(super6_state::super6) MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(24'000'000)/6) MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT)) - MCFG_Z80DMA_OUT_INT_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg2)) - MCFG_Z80DMA_IN_MREQ_CB(READ8(super6_state, memory_read_byte)) - MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(super6_state, memory_write_byte)) - MCFG_Z80DMA_IN_IORQ_CB(READ8(super6_state, io_read_byte)) - MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(super6_state, io_write_byte)) + MCFG_Z80DMA_OUT_INT_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg2)) + MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, super6_state, memory_read_byte)) + MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, super6_state, memory_write_byte)) + MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, super6_state, io_read_byte)) + MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, super6_state, io_write_byte)) MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(24'000'000)/4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_WD2793_ADD(WD2793_TAG, 1000000) - MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(super6_state, fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(super6_state, fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, super6_state, fdc_intrq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, super6_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", super6_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", super6_floppies, nullptr, floppy_image_device::default_floppy_formats) MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(24'000'000)/4) - MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) - MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) - MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) - MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr)) - MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) + MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) + MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) + MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) + MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) + MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr)) + MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal") - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w)) + MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal") + MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w)) MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) - MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w)) + MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w)) MCFG_DEVICE_ADD(BR1945_TAG, COM8116, XTAL(5'068'800)) - MCFG_COM8116_FR_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1)) - MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w)) + MCFG_COM8116_FR_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80DART_TAG, z80dart_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80CTC_TAG, z80ctc_device, trg1)) + MCFG_COM8116_FT_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w)) // internal ram MCFG_RAM_ADD(RAM_TAG) |