diff options
Diffstat (limited to 'src/mame/drivers/kdt6.cpp')
-rw-r--r-- | src/mame/drivers/kdt6.cpp | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp index 0be9d8f4e9e..14cbb8daa8b 100644 --- a/src/mame/drivers/kdt6.cpp +++ b/src/mame/drivers/kdt6.cpp @@ -615,9 +615,9 @@ static const z80_daisy_config daisy_chain_intf[] = }; MACHINE_CONFIG_START(kdt6_state::psi98) - MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4) - MCFG_CPU_PROGRAM_MAP(psi98_mem) - MCFG_CPU_IO_MAP(psi98_io) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_DEVICE_PROGRAM_MAP(psi98_mem) + MCFG_DEVICE_IO_MAP(psi98_io) MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) // video hardware @@ -632,74 +632,74 @@ MACHINE_CONFIG_START(kdt6_state::psi98) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(kdt6_state, crtc_update_row) - MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE("ctc2", z80ctc_device, trg2)) + MCFG_MC6845_OUT_VSYNC_CB(WRITELINE("ctc2", z80ctc_device, trg2)) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("beeper", BEEP, 1000) // frequency unknown + MCFG_DEVICE_ADD("beeper", BEEP, 1000) // frequency unknown MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_TIMER_DRIVER_ADD("beep_timer", kdt6_state, beeper_off) MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4) - MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(kdt6_state, busreq_w)) + MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, kdt6_state, busreq_w)) MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80DMA_IN_MREQ_CB(READ8(kdt6_state, memory_r)) - MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(kdt6_state, memory_w)) - MCFG_Z80DMA_IN_IORQ_CB(READ8(kdt6_state, io_r)) - MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(kdt6_state, io_w)) + MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, kdt6_state, memory_r)) + MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, kdt6_state, memory_w)) + MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, kdt6_state, io_r)) + MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, kdt6_state, io_w)) // jumper J3 allows selection of 16MHz / 8 instead MCFG_CLOCK_ADD("uart_clk", XTAL(9'830'400) / 8) - MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc1", z80ctc_device, trg1)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg2)) + MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc1", z80ctc_device, trg1)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc1", z80ctc_device, trg2)) MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(16'000'000) / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) - MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("sio", z80sio_device, rxca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w)) + MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w)) + MCFG_Z80CTC_ZC2_CB(WRITELINE("sio", z80sio_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w)) MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(16'000'000) / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w)) - MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc2", z80ctc_device, trg3)) + MCFG_Z80CTC_ZC0_CB(WRITELINE("speaker", speaker_sound_device, level_w)) + MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc2", z80ctc_device, trg3)) MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(16'000'000) / 4) MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd)) - MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr)) - MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts)) - MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE(kdt6_state, siob_tx_w)) - MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr)) - MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts)) - - MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcda_w)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE("sio", z80sio_device, synca_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w)) MCFG_DEVCB_XOR(1) - - MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(WRITELINE(kdt6_state, rs232b_rx_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE("sio", z80sio_device, syncb_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w)) MCFG_DEVCB_XOR(1) + MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts)) + MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE(*this, kdt6_state, siob_tx_w)) + MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts)) + + MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE("sio", z80sio_device, dcda_w)) + MCFG_RS232_DSR_HANDLER(WRITELINE("sio", z80sio_device, synca_w)) + MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w)) MCFG_DEVCB_XOR(1) + + MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(*this, kdt6_state, rs232b_rx_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE("sio", z80sio_device, dcdb_w)) + MCFG_RS232_DSR_HANDLER(WRITELINE("sio", z80sio_device, syncb_w)) + MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w)) MCFG_DEVCB_XOR(1) MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000) / 4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80PIO_OUT_PA_CB(WRITE8(kdt6_state, pio_porta_w)) - MCFG_Z80PIO_IN_PB_CB(DEVREAD8("cent_data_in", input_buffer_device, read)) - MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) + MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kdt6_state, pio_porta_w)) + MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, read)) + MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write)) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in") - MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("pio", z80pio_device, pa2_w)) - MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("pio", z80pio_device, pa3_w)) - MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("pio", z80pio_device, pa4_w)) - MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE("pio", z80pio_device, pa5_w)) + MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("pio", z80pio_device, pa2_w)) + MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("pio", z80pio_device, pa3_w)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("pio", z80pio_device, pa4_w)) + MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE("pio", z80pio_device, pa5_w)) MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") @@ -707,16 +707,16 @@ MACHINE_CONFIG_START(kdt6_state::psi98) MCFG_UPD1990A_ADD("rtc", XTAL(32'768), NOOP, NOOP) MCFG_UPD765A_ADD("fdc", true, true) - MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc1", z80ctc_device, trg0)) - MCFG_UPD765_DRQ_CALLBACK(WRITELINE(kdt6_state, fdc_drq_w)) + MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("ctc1", z80ctc_device, trg0)) + MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, kdt6_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", kdt6_floppies, "fd55f", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", kdt6_floppies, "fd55f", floppy_image_device::default_floppy_formats) MCFG_SOFTWARE_LIST_ADD("floppy_list", "psi98") MCFG_PSI_KEYBOARD_INTERFACE_ADD("kbd", "hle") - MCFG_PSI_KEYBOARD_RX_HANDLER(WRITELINE(kdt6_state, keyboard_rx_w)) - MCFG_PSI_KEYBOARD_KEY_STROBE_HANDLER(DEVWRITELINE("ctc2", z80ctc_device, trg1)) + MCFG_PSI_KEYBOARD_RX_HANDLER(WRITELINE(*this, kdt6_state, keyboard_rx_w)) + MCFG_PSI_KEYBOARD_KEY_STROBE_HANDLER(WRITELINE("ctc2", z80ctc_device, trg1)) // 6 ECB slots MACHINE_CONFIG_END |