diff options
Diffstat (limited to 'src/mame/drivers/rc702.cpp')
-rw-r--r-- | src/mame/drivers/rc702.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp index bbe87db641d..8919c17b981 100644 --- a/src/mame/drivers/rc702.cpp +++ b/src/mame/drivers/rc702.cpp @@ -329,20 +329,20 @@ static void floppies(device_slot_interface &device) MACHINE_CONFIG_START(rc702_state::rc702) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2) - MCFG_CPU_PROGRAM_MAP(rc702_mem) - MCFG_CPU_IO_MAP(rc702_io) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(rc702_mem) + MCFG_DEVICE_IO_MAP(rc702_io) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) MCFG_MACHINE_RESET_OVERRIDE(rc702_state, rc702) MCFG_DEVICE_ADD("ctc_clock", CLOCK, 614000) - MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(rc702_state, clock_w)) + MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, rc702_state, clock_w)) MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(8'000'000) / 2) - MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80dart_device, txca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80dart_device, rxca_w)) - MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80dart_device, rxtxcb_w)) + MCFG_Z80CTC_ZC0_CB(WRITELINE("sio1", z80dart_device, txca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1", z80dart_device, rxca_w)) + MCFG_Z80CTC_ZC1_CB(WRITELINE("sio1", z80dart_device, rxtxcb_w)) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD("sio1", Z80DART, XTAL(8'000'000) / 2) @@ -350,22 +350,22 @@ MACHINE_CONFIG_START(rc702_state::rc702) MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) -// MCFG_Z80PIO_OUT_PB_CB(WRITE8(rc702_state, portxx_w)) // parallel port +// MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, rc702_state, portxx_w)) // parallel port MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 2) - MCFG_I8237_OUT_HREQ_CB(WRITELINE(rc702_state, busreq_w)) - MCFG_I8237_OUT_EOP_CB(WRITELINE(rc702_state, tc_w)) // inverted - MCFG_I8237_IN_MEMR_CB(READ8(rc702_state, memory_read_byte)) - MCFG_I8237_OUT_MEMW_CB(WRITE8(rc702_state, memory_write_byte)) - MCFG_I8237_IN_IOR_1_CB(DEVREAD8("fdc", upd765a_device, mdma_r)) - MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8("fdc", upd765a_device, mdma_w)) - MCFG_I8237_OUT_IOW_2_CB(DEVWRITE8("crtc", i8275_device, dack_w)) - MCFG_I8237_OUT_IOW_3_CB(DEVWRITE8("crtc", i8275_device, dack_w)) - MCFG_I8237_OUT_DACK_1_CB(WRITELINE(rc702_state, dack1_w)) // inverted + MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, rc702_state, busreq_w)) + MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, rc702_state, tc_w)) // inverted + MCFG_I8237_IN_MEMR_CB(READ8(*this, rc702_state, memory_read_byte)) + MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, rc702_state, memory_write_byte)) + MCFG_I8237_IN_IOR_1_CB(READ8("fdc", upd765a_device, mdma_r)) + MCFG_I8237_OUT_IOW_1_CB(WRITE8("fdc", upd765a_device, mdma_w)) + MCFG_I8237_OUT_IOW_2_CB(WRITE8("crtc", i8275_device, dack_w)) + MCFG_I8237_OUT_IOW_3_CB(WRITE8("crtc", i8275_device, dack_w)) + MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, rc702_state, dack1_w)) // inverted MCFG_UPD765A_ADD("fdc", false, true) - MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc1", z80ctc_device, trg3)) - MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma", am9517a_device, dreq1_w)) + MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("ctc1", z80ctc_device, trg3)) + MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma", am9517a_device, dreq1_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) @@ -374,8 +374,8 @@ MACHINE_CONFIG_START(rc702_state::rc702) MCFG_GENERIC_KEYBOARD_CB(PUT(rc702_state, kbd_put)) MCFG_DEVICE_ADD("7474", TTL7474, 0) - MCFG_7474_COMP_OUTPUT_CB(WRITELINE(rc702_state, q_w)) - MCFG_7474_COMP_OUTPUT_CB(WRITELINE(rc702_state, qbar_w)) + MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, rc702_state, q_w)) + MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, rc702_state, qbar_w)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -387,14 +387,14 @@ MACHINE_CONFIG_START(rc702_state::rc702) MCFG_DEVICE_ADD("crtc", I8275, 11640000/7) MCFG_I8275_CHARACTER_WIDTH(7) MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(rc702_state, display_pixels) - MCFG_I8275_IRQ_CALLBACK(DEVWRITELINE("7474", ttl7474_device, clear_w)) MCFG_DEVCB_INVERT - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg2)) - MCFG_I8275_DRQ_CALLBACK(WRITELINE(rc702_state, crtc_drq_w)) + MCFG_I8275_IRQ_CALLBACK(WRITELINE("7474", ttl7474_device, clear_w)) MCFG_DEVCB_INVERT + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc1", z80ctc_device, trg2)) + MCFG_I8275_DRQ_CALLBACK(WRITELINE(*this, rc702_state, crtc_drq_w)) MCFG_PALETTE_ADD("palette", 2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("beeper", BEEP, 1000) + MCFG_DEVICE_ADD("beeper", BEEP, 1000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END |