From 113badde167bda29fa012108c9a9fa9ab1602114 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Wed, 20 May 2020 20:38:24 +0200 Subject: devices/bus: a few macro removals (nw) --- src/devices/bus/ecbbus/grip.cpp | 10 +++++----- src/devices/bus/ecbbus/grip.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/devices/bus/ecbbus') diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 83adcc78952..a51abad6c91 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -223,7 +223,7 @@ static const int16_t speaker_levels[] = { -32768, 0, 32767, 0 }; // I8255A interface //------------------------------------------------- -READ8_MEMBER( ecb_grip21_device::ppi_pa_r ) +uint8_t ecb_grip21_device::ppi_pa_r() { /* @@ -243,7 +243,7 @@ READ8_MEMBER( ecb_grip21_device::ppi_pa_r ) return m_ppi_pa; } -WRITE8_MEMBER( ecb_grip21_device::ppi_pa_w ) +void ecb_grip21_device::ppi_pa_w(uint8_t data) { /* @@ -263,7 +263,7 @@ WRITE8_MEMBER( ecb_grip21_device::ppi_pa_w ) m_ppi_pa = data; } -READ8_MEMBER( ecb_grip21_device::ppi_pb_r ) +uint8_t ecb_grip21_device::ppi_pb_r() { /* @@ -283,7 +283,7 @@ READ8_MEMBER( ecb_grip21_device::ppi_pb_r ) return m_keydata; } -WRITE8_MEMBER( ecb_grip21_device::ppi_pc_w ) +void ecb_grip21_device::ppi_pc_w(uint8_t data) { /* @@ -324,7 +324,7 @@ WRITE_LINE_MEMBER(ecb_grip21_device::write_centronics_busy) m_centronics_busy = state; } -READ8_MEMBER( ecb_grip21_device::sti_gpio_r ) +uint8_t ecb_grip21_device::sti_gpio_r() { /* diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h index d1e1456eb57..9deaa5ddfbe 100644 --- a/src/devices/bus/ecbbus/grip.h +++ b/src/devices/bus/ecbbus/grip.h @@ -52,11 +52,11 @@ protected: virtual void ecbbus_io_w(offs_t offset, uint8_t data) override; private: - DECLARE_READ8_MEMBER( ppi_pa_r ); - DECLARE_WRITE8_MEMBER( ppi_pa_w ); - DECLARE_READ8_MEMBER( ppi_pb_r ); - DECLARE_WRITE8_MEMBER( ppi_pc_w ); - DECLARE_READ8_MEMBER( sti_gpio_r ); + uint8_t ppi_pa_r(); + void ppi_pa_w(uint8_t data); + uint8_t ppi_pb_r(); + void ppi_pc_w(uint8_t data); + uint8_t sti_gpio_r(); DECLARE_WRITE_LINE_MEMBER( speaker_w ); void kb_w(uint8_t data); -- cgit v1.2.3-70-g09d2