diff options
Diffstat (limited to 'src/mame/drivers/rc759.cpp')
-rw-r--r-- | src/mame/drivers/rc759.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp index 21be59dd228..028b2ee5541 100644 --- a/src/mame/drivers/rc759.cpp +++ b/src/mame/drivers/rc759.cpp @@ -531,29 +531,29 @@ static void rc759_floppies(device_slot_interface &device) } MACHINE_CONFIG_START(rc759_state::rc759) - MCFG_CPU_ADD("maincpu", I80186, 6000000) - MCFG_CPU_PROGRAM_MAP(rc759_map) - MCFG_CPU_IO_MAP(rc759_io) - MCFG_80186_IRQ_SLAVE_ACK(READ8(rc759_state, irq_callback)) - MCFG_80186_TMROUT0_HANDLER(WRITELINE(rc759_state, i186_timer0_w)) - MCFG_80186_TMROUT1_HANDLER(WRITELINE(rc759_state, i186_timer1_w)) + MCFG_DEVICE_ADD("maincpu", I80186, 6000000) + MCFG_DEVICE_PROGRAM_MAP(rc759_map) + MCFG_DEVICE_IO_MAP(rc759_io) + MCFG_80186_IRQ_SLAVE_ACK(READ8(*this, rc759_state, irq_callback)) + MCFG_80186_TMROUT0_HANDLER(WRITELINE(*this, rc759_state, i186_timer0_w)) + MCFG_80186_TMROUT1_HANDLER(WRITELINE(*this, rc759_state, i186_timer1_w)) // interrupt controller MCFG_DEVICE_ADD("pic", PIC8259, 0) - MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w)) + MCFG_PIC8259_OUT_INT_CB(WRITELINE("maincpu", i80186_cpu_device, int0_w)) // nvram MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", rc759_state, nvram_init) // ppi MCFG_DEVICE_ADD("ppi", I8255, 0) - MCFG_I8255_IN_PORTA_CB(READ8(rc759_state, ppi_porta_r)) - MCFG_I8255_IN_PORTB_CB(READ8(rc759_state, ppi_portb_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(rc759_state, ppi_portc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, rc759_state, ppi_porta_r)) + MCFG_I8255_IN_PORTB_CB(READ8(*this, rc759_state, ppi_portb_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, rc759_state, ppi_portc_w)) // rtc MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768)) - MCFG_MM58167_IRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir3_w)) + MCFG_MM58167_IRQ_CALLBACK(WRITELINE("pic", pic8259_device, ir3_w)) // video MCFG_SCREEN_ADD("screen", RASTER) @@ -563,7 +563,7 @@ MACHINE_CONFIG_START(rc759_state::rc759) MCFG_I82730_ADD("txt", "maincpu", 1250000) MCFG_VIDEO_SET_SCREEN("screen") MCFG_I82730_UPDATE_ROW_CB(rc759_state, txt_update_row) - MCFG_I82730_SINT_HANDLER(DEVWRITELINE("pic", pic8259_device, ir4_w)) + MCFG_I82730_SINT_HANDLER(WRITELINE("pic", pic8259_device, ir4_w)) // keyboard MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0) @@ -575,29 +575,29 @@ MACHINE_CONFIG_START(rc759_state::rc759) // sound MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_SOUND_ADD("snd", SN76489A, XTAL(20'000'000) / 10) + MCFG_DEVICE_ADD("snd", SN76489A, XTAL(20'000'000) / 10) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // internal centronics MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(rc759_state, centronics_busy_w)) - MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(rc759_state, centronics_ack_w)) - MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(rc759_state, centronics_fault_w)) - MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(rc759_state, centronics_perror_w)) - MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(rc759_state, centronics_select_w)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, rc759_state, centronics_busy_w)) + MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, rc759_state, centronics_ack_w)) + MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, rc759_state, centronics_fault_w)) + MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, rc759_state, centronics_perror_w)) + MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, rc759_state, centronics_select_w)) // isbx slot MCFG_ISBX_SLOT_ADD("isbx", 0, isbx_cards, nullptr) - MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int1_w)) - MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int3_w)) - MCFG_ISBX_SLOT_MDRQT_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq0_w)) + MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int1_w)) + MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int3_w)) + MCFG_ISBX_SLOT_MDRQT_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq0_w)) // floppy disk controller MCFG_WD2797_ADD("fdc", 1000000) -// MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir0_w)) -// MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w)) +// MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic", pic8259_device, ir0_w)) +// MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq1_w)) // floppy drives MCFG_FLOPPY_DRIVE_ADD("fdc:0", rc759_floppies, "hd", floppy_image_device::default_floppy_formats) |