summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/babbage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/babbage.cpp')
-rw-r--r--src/mame/drivers/babbage.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp
index 82bf3cd55ee..6b03aa0f27c 100644
--- a/src/mame/drivers/babbage.cpp
+++ b/src/mame/drivers/babbage.cpp
@@ -230,9 +230,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(babbage_state::keyboard_callback)
***************************************************************************/
-MACHINE_CONFIG_START(babbage_state::babbage)
+void babbage_state::babbage(machine_config &config)
+{
/* basic machine hardware */
-
Z80(config, m_maincpu, MAIN_CLOCK); //2.5MHz
m_maincpu->set_addrmap(AS_PROGRAM, &babbage_state::babbage_map);
m_maincpu->set_addrmap(AS_IO, &babbage_state::babbage_io);
@@ -242,11 +242,11 @@ MACHINE_CONFIG_START(babbage_state::babbage)
config.set_default_layout(layout_babbage);
/* Devices */
- MCFG_DEVICE_ADD("z80ctc", Z80CTC, MAIN_CLOCK)
- MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, babbage_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, babbage_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, babbage_state, ctc_z2_w))
+ Z80CTC(config, m_ctc, MAIN_CLOCK);
+ m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ m_ctc->zc_callback<0>().set(FUNC(babbage_state::ctc_z0_w));
+ m_ctc->zc_callback<1>().set(FUNC(babbage_state::ctc_z1_w));
+ m_ctc->zc_callback<2>().set(FUNC(babbage_state::ctc_z2_w));
Z80PIO(config, m_pio_1, MAIN_CLOCK);
m_pio_1->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
@@ -257,8 +257,8 @@ MACHINE_CONFIG_START(babbage_state::babbage)
m_pio_2->in_pa_callback().set(FUNC(babbage_state::pio2_a_r));
m_pio_2->out_pb_callback().set(FUNC(babbage_state::pio2_b_w));
- MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", babbage_state, keyboard_callback, attotime::from_hz(30))
-MACHINE_CONFIG_END
+ TIMER(config, "keyboard_timer", 0).configure_periodic(timer_device::expired_delegate(FUNC(babbage_state::keyboard_callback), this), attotime::from_hz(30));
+}
/***************************************************************************