summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/atarist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/atarist.cpp')
-rw-r--r--src/mame/drivers/atarist.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 8712e0f1ee4..dae918572a7 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -2046,7 +2046,7 @@ MACHINE_CONFIG_START(st_state::st)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats)
MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m_mfp, mc68901_device, i0_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -2058,11 +2058,11 @@ MACHINE_CONFIG_START(st_state::st)
m_mfp->out_tdo_cb().set(FUNC(st_state::mfp_tdo_w));
m_mfp->out_so_cb().set(RS232_TAG, FUNC(rs232_port_device::write_txd));
- MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
- MCFG_RS232_DCD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i1_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i2_w))
- MCFG_RS232_RI_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i6_w))
+ rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr));
+ rs232.rxd_handler().set(m_mfp, FUNC(mc68901_device::write_rx));
+ rs232.dcd_handler().set(m_mfp, FUNC(mc68901_device::i1_w));
+ rs232.cts_handler().set(m_mfp, FUNC(mc68901_device::i2_w));
+ rs232.ri_handler().set(m_mfp, FUNC(mc68901_device::i6_w));
ACIA6850(config, m_acia0, 0);
m_acia0->txd_handler().set(FUNC(st_state::ikbd_tx_w));
@@ -2073,7 +2073,7 @@ MACHINE_CONFIG_START(st_state::st)
m_acia1->irq_handler().set("aciairq", FUNC(input_merger_device::in_w<1>));
input_merger_device &aciairq(INPUT_MERGER_ANY_HIGH(config, "aciairq"));
- aciairq.output_handler().set(MC68901_TAG, FUNC(mc68901_device::i4_w)).invert();
+ aciairq.output_handler().set(m_mfp, FUNC(mc68901_device::i4_w)).invert();
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
@@ -2140,7 +2140,7 @@ MACHINE_CONFIG_START(megast_state::megast)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats)
MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m_mfp, mc68901_device, i0_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -2152,11 +2152,11 @@ MACHINE_CONFIG_START(megast_state::megast)
m_mfp->out_tdo_cb().set(FUNC(st_state::mfp_tdo_w));
m_mfp->out_so_cb().set(RS232_TAG, FUNC(rs232_port_device::write_txd));
- MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
- MCFG_RS232_DCD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i1_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i2_w))
- MCFG_RS232_RI_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i6_w))
+ rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr));
+ rs232.rxd_handler().set(m_mfp, FUNC(mc68901_device::write_rx));
+ rs232.dcd_handler().set(m_mfp, FUNC(mc68901_device::i1_w));
+ rs232.cts_handler().set(m_mfp, FUNC(mc68901_device::i2_w));
+ rs232.ri_handler().set(m_mfp, FUNC(mc68901_device::i6_w));
ACIA6850(config, m_acia0, 0);
m_acia0->txd_handler().set(FUNC(st_state::ikbd_tx_w));
@@ -2167,7 +2167,7 @@ MACHINE_CONFIG_START(megast_state::megast)
m_acia1->irq_handler().set("aciairq", FUNC(input_merger_device::in_w<1>));
input_merger_device &aciairq(INPUT_MERGER_ANY_HIGH(config, "aciairq"));
- aciairq.output_handler().set(MC68901_TAG, FUNC(mc68901_device::i4_w)).invert();
+ aciairq.output_handler().set(m_mfp, FUNC(mc68901_device::i4_w)).invert();
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
@@ -2242,7 +2242,7 @@ MACHINE_CONFIG_START(ste_state::ste)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats)
MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m_mfp, mc68901_device, i0_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -2254,11 +2254,11 @@ MACHINE_CONFIG_START(ste_state::ste)
m_mfp->out_tdo_cb().set(FUNC(st_state::mfp_tdo_w));
m_mfp->out_so_cb().set(RS232_TAG, FUNC(rs232_port_device::write_txd));
- MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
- MCFG_RS232_DCD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i1_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i2_w))
- MCFG_RS232_RI_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i6_w))
+ rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr));
+ rs232.rxd_handler().set(m_mfp, FUNC(mc68901_device::write_rx));
+ rs232.dcd_handler().set(m_mfp, FUNC(mc68901_device::i1_w));
+ rs232.cts_handler().set(m_mfp, FUNC(mc68901_device::i2_w));
+ rs232.ri_handler().set(m_mfp, FUNC(mc68901_device::i6_w));
ACIA6850(config, m_acia0, 0);
m_acia0->txd_handler().set(FUNC(st_state::ikbd_tx_w));
@@ -2269,7 +2269,7 @@ MACHINE_CONFIG_START(ste_state::ste)
m_acia1->irq_handler().set("aciairq", FUNC(input_merger_device::in_w<1>));
input_merger_device &aciairq(INPUT_MERGER_ANY_HIGH(config, "aciairq"));
- aciairq.output_handler().set(MC68901_TAG, FUNC(mc68901_device::i4_w)).invert();
+ aciairq.output_handler().set(m_mfp, FUNC(mc68901_device::i4_w)).invert();
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
@@ -2358,15 +2358,15 @@ static MACHINE_CONFIG_START(stbook_state::stbook)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats)
MCFG_DEVICE_ADD("centronics", CENTRONICS, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m_mfp, mc68901_device, i0_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
- MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
- MCFG_SERIAL_OUT_RX_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
- MCFG_RS232_OUT_DCD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i1_w))
- MCFG_RS232_OUT_CTS_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i2_w))
- MCFG_RS232_OUT_RI_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i6_w))
+ rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr));
+ rs232.rxd_handler().set(m_mfp, FUNC(mc68901_device::write_rx));
+ rs232.dcd_handler().set(m_mfp, FUNC(mc68901_device::i1_w));
+ rs232.cts_handler().set(m_mfp, FUNC(mc68901_device::i2_w));
+ rs232.ri_handler().set(m_mfp, FUNC(mc68901_device::i6_w));
// device hardware
ACIA6850(config, m_acia0, 0);
@@ -2378,7 +2378,7 @@ static MACHINE_CONFIG_START(stbook_state::stbook)
m_acia1->irq_handler().set("aciairq", FUNC(input_merger_device::in_w<1>));
input_merger_device &aciairq(INPUT_MERGER_ANY_HIGH(config, "aciairq"));
- aciairq.output_handler().set(MC68901_TAG, FUNC(mc68901_device::i4_w)).invert();
+ aciairq.output_handler().set(m_mfp, FUNC(mc68901_device::i4_w)).invert();
MCFG_SERIAL_PORT_ADD("mdin", midiin_slot, "midiin")
MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))