summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/aussiebyte.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/aussiebyte.cpp')
-rw-r--r--src/mame/drivers/aussiebyte.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index b6ba84a6b58..82932a19a88 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -526,20 +526,20 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, 4.9152_MHz_XTAL / 4)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg2))
-
- MCFG_DEVICE_ADD("ctc", Z80CTC, 16_MHz_XTAL / 4)
- MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE("sio1", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE("sio1", z80sio_device, rxtxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, aussiebyte_state, ctc_z2_w)) // SIO2 Ch B, CTC Ch 3
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2", z80sio_device, rxtxcb_w))
+ clock_device &ctc_clock(CLOCK(config, "ctc_clock", 4.9152_MHz_XTAL / 4));
+ ctc_clock.signal_handler().set(m_ctc, FUNC(z80ctc_device::trg0));
+ ctc_clock.signal_handler().append(m_ctc, FUNC(z80ctc_device::trg1));
+ ctc_clock.signal_handler().append(m_ctc, FUNC(z80ctc_device::trg2));
+
+ Z80CTC(config, m_ctc, 16_MHz_XTAL / 4);
+ m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ m_ctc->zc_callback<0>().set("sio1", FUNC(z80sio_device::rxca_w));
+ m_ctc->zc_callback<0>().append("sio1", FUNC(z80sio_device::txca_w));
+ m_ctc->zc_callback<1>().set("sio1", FUNC(z80sio_device::rxtxcb_w));
+ m_ctc->zc_callback<1>().append("sio2", FUNC(z80sio_device::rxca_w));
+ m_ctc->zc_callback<1>().append("sio2", FUNC(z80sio_device::txca_w));
+ m_ctc->zc_callback<2>().set(FUNC(aussiebyte_state::ctc_z2_w)); // SIO2 Ch B, CTC Ch 3
+ m_ctc->zc_callback<2>().append("sio2", FUNC(z80sio_device::rxtxcb_w));
MCFG_DEVICE_ADD("dma", Z80DMA, 16_MHz_XTAL / 4)
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -550,11 +550,11 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, aussiebyte_state, io_read_byte))
MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, aussiebyte_state, io_write_byte))
- MCFG_DEVICE_ADD("pio1", Z80PIO, 16_MHz_XTAL / 4)
- MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, bus_w))
- MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, bus_r))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(m_centronics, centronics_device, write_strobe)) MCFG_DEVCB_INVERT
+ Z80PIO(config, m_pio1, 16_MHz_XTAL / 4);
+ m_pio1->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ m_pio1->out_pa_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
+ m_pio1->in_pb_callback().set("cent_data_in", FUNC(input_buffer_device::bus_r));
+ m_pio1->out_ardy_callback().set(m_centronics, FUNC(centronics_device::write_strobe)).invert();
MCFG_DEVICE_ADD("pio2", Z80PIO, 16_MHz_XTAL / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))