summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/univac.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/univac.cpp')
-rw-r--r--src/mame/drivers/univac.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp
index 9f175aadaca..e90ca7d3dbb 100644
--- a/src/mame/drivers/univac.cpp
+++ b/src/mame/drivers/univac.cpp
@@ -332,24 +332,24 @@ MACHINE_CONFIG_START(univac_state::uts20)
MCFG_NVRAM_ADD_1FILL("nvram")
- MCFG_DEVICE_ADD("ctc_clock", CLOCK, 2000000)
- 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_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg3))
-
- MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
- MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC1_CB(WRITELINE("uart", z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", z80sio_device, rxca_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE("uart", z80sio_device, rxtxcb_w))
-
- MCFG_DEVICE_ADD("uart", Z80SIO, XTAL(4'000'000))
- MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("uart", z80sio_device, rxa_w)) // FIXME: hacked in permanent loopback to pass test
- MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("uart", z80sio_device, rxb_w)) // FIXME: hacked in permanent loopback to pass test
- MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE("uart", z80sio_device, dcdb_w)) // FIXME: hacked in permanent loopback to pass test
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", z80sio_device, ctsb_w)) // FIXME: hacked in permanent loopback to pass test
+ clock_device &ctc_clock(CLOCK(config, "ctc_clock", 2000000));
+ 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));
+ ctc_clock.signal_handler().append(m_ctc, FUNC(z80ctc_device::trg3));
+
+ Z80CTC(config, m_ctc, 4_MHz_XTAL);
+ m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ m_ctc->zc_callback<1>().set(m_uart, FUNC(z80sio_device::txca_w));
+ m_ctc->zc_callback<1>().append(m_uart, FUNC(z80sio_device::rxca_w));
+ m_ctc->zc_callback<2>().set(m_uart, FUNC(z80sio_device::rxtxcb_w));
+
+ Z80SIO(config, m_uart, 4_MHz_XTAL);
+ m_uart->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ m_uart->out_txda_callback().set(m_uart, FUNC(z80sio_device::rxa_w)); // FIXME: hacked in permanent loopback to pass test
+ m_uart->out_txdb_callback().set(m_uart, FUNC(z80sio_device::rxb_w)); // FIXME: hacked in permanent loopback to pass test
+ m_uart->out_wrdyb_callback().set(m_uart, FUNC(z80sio_device::dcdb_w)); // FIXME: hacked in permanent loopback to pass test
+ m_uart->out_wrdyb_callback().append(m_uart, FUNC(z80sio_device::ctsb_w)); // FIXME: hacked in permanent loopback to pass test
/* Sound */
SPEAKER(config, "mono").front_center();