diff options
Diffstat (limited to 'src/devices/bus/cpc/cpc_rs232.cpp')
-rw-r--r-- | src/devices/bus/cpc/cpc_rs232.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp index 40fc0853539..e3be3af93d3 100644 --- a/src/devices/bus/cpc/cpc_rs232.cpp +++ b/src/devices/bus/cpc/cpc_rs232.cpp @@ -52,7 +52,7 @@ void cpc_rs232_device::device_add_mconfig(machine_config &config) m_rs232->rxd_handler().set(m_dart, FUNC(z80dart_device::rxa_w)); m_rs232->dcd_handler().set(m_dart, FUNC(z80dart_device::dcda_w)); m_rs232->cts_handler().set(m_dart, FUNC(z80dart_device::ctsa_w)); -// m_rs232->ri_handler().set(m_dart, FUNC(z80dart_device::ria_w)); + m_rs232->ri_handler().set(m_dart, FUNC(z80dart_device::ria_w)); // pass-through cpc_expansion_slot_device &exp(CPC_EXPANSION_SLOT(config, "exp", DERIVED_CLOCK(1, 1), cpc_exp_cards, nullptr)); @@ -106,8 +106,8 @@ void cpc_rs232_device::device_start() m_slot = dynamic_cast<cpc_expansion_slot_device *>(owner()); address_space &space = m_slot->cpu().space(AS_IO); - space.install_readwrite_handler(0xfadc,0xfadf,read8_delegate(FUNC(cpc_rs232_device::dart_r),this),write8_delegate(FUNC(cpc_rs232_device::dart_w),this)); - space.install_readwrite_handler(0xfbdc,0xfbdf,read8_delegate(FUNC(cpc_rs232_device::pit_r),this),write8_delegate(FUNC(cpc_rs232_device::pit_w),this)); + space.install_readwrite_handler(0xfadc,0xfadf, read8sm_delegate(*this, FUNC(cpc_rs232_device::dart_r)), write8sm_delegate(*this, FUNC(cpc_rs232_device::dart_w))); + space.install_readwrite_handler(0xfbdc,0xfbdf, read8sm_delegate(*this, FUNC(cpc_rs232_device::pit_r)), write8sm_delegate(*this, FUNC(cpc_rs232_device::pit_w))); } //------------------------------------------------- @@ -119,38 +119,38 @@ void cpc_rs232_device::device_reset() } -WRITE_LINE_MEMBER(cpc_rs232_device::pit_out0_w) +void cpc_rs232_device::pit_out0_w(int state) { m_dart->txca_w(state); } -WRITE_LINE_MEMBER(cpc_rs232_device::pit_out1_w) +void cpc_rs232_device::pit_out1_w(int state) { m_dart->rxca_w(state); } -WRITE_LINE_MEMBER(cpc_rs232_device::pit_out2_w) +void cpc_rs232_device::pit_out2_w(int state) { m_dart->txcb_w(state); m_dart->rxcb_w(state); } -READ8_MEMBER(cpc_rs232_device::dart_r) +uint8_t cpc_rs232_device::dart_r(offs_t offset) { return m_dart->ba_cd_r(offset); } -WRITE8_MEMBER(cpc_rs232_device::dart_w) +void cpc_rs232_device::dart_w(offs_t offset, uint8_t data) { m_dart->ba_cd_w(offset,data); } -READ8_MEMBER(cpc_rs232_device::pit_r) +uint8_t cpc_rs232_device::pit_r(offs_t offset) { return m_pit->read(offset); } -WRITE8_MEMBER(cpc_rs232_device::pit_w) +void cpc_rs232_device::pit_w(offs_t offset, uint8_t data) { m_pit->write(offset,data); } |