diff options
author | Robbbert <Robbbert@users.noreply.github.com> | 2017-09-22 00:11:02 +1000 |
---|---|---|
committer | Robbbert <Robbbert@users.noreply.github.com> | 2017-09-22 00:11:02 +1000 |
commit | fd10ecb1fd5fa3f623c62e83acdc9eae01305a7c (patch) | |
tree | 879511be949195c677f4bb83730af42c082a580f /src/mame/drivers/ampro.cpp | |
parent | ce256c6444a9e34241ac502106c9da1257ec4468 (diff) |
(nw) more cleanups
Diffstat (limited to 'src/mame/drivers/ampro.cpp')
-rw-r--r-- | src/mame/drivers/ampro.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp index 213c26e8fdd..fa7e773c4f7 100644 --- a/src/mame/drivers/ampro.cpp +++ b/src/mame/drivers/ampro.cpp @@ -46,11 +46,9 @@ public: DECLARE_DRIVER_INIT(ampro); DECLARE_MACHINE_RESET(ampro); TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); - DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); DECLARE_WRITE8_MEMBER(port00_w); DECLARE_READ8_MEMBER(io_r); DECLARE_WRITE8_MEMBER(io_w); - DECLARE_WRITE_LINE_MEMBER(clock_w); private: required_device<cpu_device> m_maincpu; @@ -121,19 +119,6 @@ static const z80_daisy_config daisy_chain_intf[] = { nullptr } }; -// Baud rate generator. All inputs are 2MHz. -WRITE_LINE_MEMBER( ampro_state::clock_w ) -{ - m_ctc->trg0(state); - m_ctc->trg1(state); -} - -WRITE_LINE_MEMBER( ampro_state::ctc_z0_w ) -{ - m_dart->rxca_w(state); - m_dart->txca_w(state); -} - static SLOT_INTERFACE_START( ampro_floppies ) SLOT_INTERFACE( "525dd", FLOPPY_525_DD ) SLOT_INTERFACE_END @@ -166,12 +151,14 @@ static MACHINE_CONFIG_START( ampro ) MCFG_MACHINE_RESET_OVERRIDE(ampro_state, ampro) MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL_16MHz / 8) // 2MHz - MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ampro_state, clock_w)) + MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0)) + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1)) /* Devices */ MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL_16MHz / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_Z80CTC_ZC0_CB(WRITELINE(ampro_state, ctc_z0_w)) // Z80DART Ch A, SIO Ch A + MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A + MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w)) MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w)) // SIO Ch B MCFG_Z80DART_ADD("dart", XTAL_16MHz / 4, 0, 0, 0, 0 ) |