From 83296b75ec1f51ee189cc140530d6d6601d91ef5 Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 21 Oct 2019 02:00:47 -0400 Subject: [PATCH] msm5832: Simplify handlers (nw) --- src/devices/bus/a2bus/timemasterho.cpp | 2 +- src/devices/bus/apricot/keyboard/hle.cpp | 4 ++-- src/devices/machine/msm5832.cpp | 4 ++-- src/devices/machine/msm5832.h | 4 ++-- src/mame/drivers/attache.cpp | 6 +++--- src/mame/drivers/aussiebyte.cpp | 4 ++-- src/mame/drivers/cmi.cpp | 2 +- src/mame/drivers/pulsar.cpp | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 6b7f0b1f5eb..466cf0af036 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -225,7 +225,7 @@ WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_b) // if it's a read, poke it into the PIA if ((data>>5) & 1) { - m_pia->write_porta(m_msm5832->data_r(space, 0)); + m_pia->write_porta(m_msm5832->data_r()); } } diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp index 28e98b9fb50..8a33c2952fa 100644 --- a/src/devices/bus/apricot/keyboard/hle.cpp +++ b/src/devices/bus/apricot/keyboard/hle.cpp @@ -290,7 +290,7 @@ void apricot_keyboard_hle_device::received_byte(uint8_t byte) if (m_rtc_index >= 0) { m_rtc->address_w(m_rtc_index--); - m_rtc->data_w(machine().dummy_space(), 0, byte); + m_rtc->data_w(byte); m_rtc->write_w(1); m_rtc->write_w(0); } @@ -316,7 +316,7 @@ void apricot_keyboard_hle_device::received_byte(uint8_t byte) for (int i = 12; i >= 0; i--) { m_rtc->address_w(i); - transmit_byte(0xf0 | m_rtc->data_r(machine().dummy_space(), 0)); + transmit_byte(0xf0 | m_rtc->data_r()); } break; diff --git a/src/devices/machine/msm5832.cpp b/src/devices/machine/msm5832.cpp index 711de519453..9d4ef6e088a 100644 --- a/src/devices/machine/msm5832.cpp +++ b/src/devices/machine/msm5832.cpp @@ -164,7 +164,7 @@ void msm5832_device::rtc_clock_updated(int year, int month, int day, int day_of_ // data_r - //------------------------------------------------- -READ8_MEMBER( msm5832_device::data_r ) +uint8_t msm5832_device::data_r() { LOG("MSM5832 Register Read %01x: %01x\n", m_address, m_data & 0x0f); @@ -176,7 +176,7 @@ READ8_MEMBER( msm5832_device::data_r ) // data_w - //------------------------------------------------- -WRITE8_MEMBER( msm5832_device::data_w ) +void msm5832_device::data_w(uint8_t data) { LOG("MSM5832 Register Write %01x: %01x\n", m_address, data & 0x0f); diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h index 2e2ea4e5ad9..5ba34a537da 100644 --- a/src/devices/machine/msm5832.h +++ b/src/devices/machine/msm5832.h @@ -40,8 +40,8 @@ public: // construction/destruction msm5832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( data_r ); - DECLARE_WRITE8_MEMBER( data_w ); + uint8_t data_r(); + void data_w(uint8_t data); void address_w(uint8_t data); diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp index aa6d08f171e..c665ad28701 100644 --- a/src/mame/drivers/attache.cpp +++ b/src/mame/drivers/attache.cpp @@ -514,7 +514,7 @@ READ8_MEMBER(attache_state::pio_portA_r) m_rtc->write_w(0); m_rtc->read_w(1); m_rtc->address_w((porta & 0xf0) >> 4); - ret = m_rtc->data_r(space,0); + ret = m_rtc->data_r(); logerror("RTC: read %02x from %02x (write)\n",ret,(porta & 0xf0) >> 4); break; case PIO_SEL_5832_READ: @@ -522,7 +522,7 @@ READ8_MEMBER(attache_state::pio_portA_r) m_rtc->write_w(0); m_rtc->read_w(1); m_rtc->address_w((porta & 0xf0) >> 4); - ret = m_rtc->data_r(space,0); + ret = m_rtc->data_r(); logerror("RTC: read %02x from %02x\n",ret,(porta & 0xf0) >> 4); break; case PIO_SEL_5101_WRITE: @@ -569,7 +569,7 @@ void attache_state::operation_strobe(address_space& space, uint8_t data) m_rtc->cs_w(1); m_rtc->read_w(0); m_rtc->address_w((data & 0xf0) >> 4); - m_rtc->data_w(space,0,data & 0x0f); + m_rtc->data_w(data & 0x0f); m_rtc->write_w(1); logerror("RTC: write %01x to %01x\n",data & 0x0f,(data & 0xf0) >> 4); break; diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp index fb07faff9eb..18a64b9ee11 100644 --- a/src/mame/drivers/aussiebyte.cpp +++ b/src/mame/drivers/aussiebyte.cpp @@ -238,7 +238,7 @@ READ8_MEMBER( aussiebyte_state::rtc_r ) { m_rtc->read_w(1); m_rtc->address_w(offset); - uint8_t data = m_rtc->data_r(space,0); + uint8_t data = m_rtc->data_r(); m_rtc->read_w(0); return data; } @@ -246,7 +246,7 @@ READ8_MEMBER( aussiebyte_state::rtc_r ) WRITE8_MEMBER( aussiebyte_state::rtc_w ) { m_rtc->address_w(offset); - m_rtc->data_w(space,0,data); + m_rtc->data_w(data); m_rtc->write_w(1); m_rtc->write_w(0); } diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp index 8b93be1abaf..48617b5d569 100644 --- a/src/mame/drivers/cmi.cpp +++ b/src/mame/drivers/cmi.cpp @@ -1476,7 +1476,7 @@ READ8_MEMBER( cmi_state::q133_1_porta_r ) { if (BIT(m_q133_pia[0]->b_output(), 1)) { - return m_msm5832->data_r(space, m_msm5832_addr) << 4; + return m_msm5832->data_r() << 4; } return 0xff; } diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp index 8efe47911b5..9663dfaab63 100644 --- a/src/mame/drivers/pulsar.cpp +++ b/src/mame/drivers/pulsar.cpp @@ -159,7 +159,7 @@ WRITE8_MEMBER( pulsar_state::ppi_pb_w ) // d0..d3 Data lines to rtc WRITE8_MEMBER( pulsar_state::ppi_pc_w ) { - m_rtc->data_w(space, 0, data & 15); + m_rtc->data_w(data & 15); } // d7 /2 SIDES @@ -168,7 +168,7 @@ READ8_MEMBER( pulsar_state::ppi_pc_r ) uint8_t data = 0; if (m_floppy) data = m_floppy->twosid_r() << 7; - return m_rtc->data_r(space, 0) | data; + return m_rtc->data_r() | data; } static DEVICE_INPUT_DEFAULTS_START( terminal )