summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/apollo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/apollo.cpp')
-rw-r--r--src/mame/machine/apollo.cpp36
1 files changed, 19 insertions, 17 deletions
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 9a80fae2563..a76920b279a 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -1108,10 +1108,10 @@ MACHINE_CONFIG_START(apollo_state::common)
m_rtc->set_24hrs(false);
m_rtc->set_epoch(0);
- MCFG_APOLLO_NI_ADD(APOLLO_NI_TAG, 0)
+ APOLLO_NI(config, m_node_id, 0);
- MCFG_APOLLO_SIO_ADD(APOLLO_SIO2_TAG, 3.6864_MHz_XTAL)
- MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(*this, apollo_state, sio2_irq_handler))
+ APOLLO_SIO(config, m_sio2, 3.6864_MHz_XTAL);
+ m_sio2->irq_cb().set(FUNC(apollo_state::sio2_irq_handler));
ISA16(config, m_isa, 0);
m_isa->set_cputag(MAINCPU);
@@ -1147,17 +1147,18 @@ MACHINE_CONFIG_START(apollo_state::common)
MACHINE_CONFIG_END
// for machines with the keyboard and a graphics head
-MACHINE_CONFIG_START(apollo_state::apollo)
+void apollo_state::apollo(machine_config &config)
+{
common(config);
- MCFG_APOLLO_SIO_ADD(APOLLO_SIO_TAG, 3.6864_MHz_XTAL)
- MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(*this, apollo_state, sio_irq_handler))
- MCFG_APOLLO_SIO_OUTPORT_CALLBACK(WRITE8(*this, apollo_state, sio_output))
- MCFG_APOLLO_SIO_A_TX_CALLBACK(WRITELINE(m_keyboard, apollo_kbd_device, rx_w))
+ APOLLO_SIO(config, m_sio, 3.6864_MHz_XTAL);
+ m_sio->irq_cb().set(FUNC(apollo_state::sio_irq_handler));
+ m_sio->outport_cb().set(FUNC(apollo_state::sio_output));
+ m_sio->a_tx_cb().set(m_keyboard, FUNC(apollo_kbd_device::rx_w));
#ifdef APOLLO_XXL
- MCFG_APOLLO_SIO_B_TX_CALLBACK(WRITELINE(APOLLO_STDIO_TAG, apollo_stdio_device, rx_w))
+ m_sio->b_tx_cb().set(APOLLO_STDIO_TAG, FUNC(apollo_stdio_device::rx_w));
#endif
-MACHINE_CONFIG_END
+}
static DEVICE_INPUT_DEFAULTS_START( apollo_terminal )
DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 )
@@ -1169,17 +1170,18 @@ static DEVICE_INPUT_DEFAULTS_START( apollo_terminal )
DEVICE_INPUT_DEFAULTS_END
// for headless machines using a serial console
-MACHINE_CONFIG_START(apollo_state::apollo_terminal)
+void apollo_state::apollo_terminal(machine_config &config)
+{
common(config);
- MCFG_APOLLO_SIO_ADD(APOLLO_SIO_TAG, 3.6864_MHz_XTAL)
- MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(*this, apollo_state, sio_irq_handler))
- MCFG_APOLLO_SIO_OUTPORT_CALLBACK(WRITE8(*this, apollo_state, sio_output))
- MCFG_APOLLO_SIO_B_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
+ APOLLO_SIO(config, m_sio, 3.6864_MHz_XTAL);
+ m_sio->irq_cb().set(FUNC(apollo_state::sio_irq_handler));
+ m_sio->outport_cb().set(FUNC(apollo_state::sio_output));
+ m_sio->b_tx_cb().set("rs232", FUNC(rs232_port_device::write_txd));
rs232_port_device &rs232(RS232_PORT(config, "rs232", default_rs232_devices, "terminal"));
- rs232.rxd_handler().set(APOLLO_SIO_TAG, FUNC(apollo_sio::rx_b_w));
+ rs232.rxd_handler().set(m_sio, FUNC(apollo_sio::rx_b_w));
rs232.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(apollo_terminal));
-MACHINE_CONFIG_END
+}
void apollo_state::init_apollo()
{