From 34a2e7a49fc32cf9b1d39d88ca5906016efb4159 Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 12 Mar 2019 10:12:44 -0400 Subject: bus/bbc/joyport, bus/bbc/userport: Simplify read/write handlers (nw) --- src/devices/bus/bbc/exp/mertec.cpp | 4 ++-- src/devices/bus/bbc/joyport/joyport.cpp | 8 ++++---- src/devices/bus/bbc/joyport/joyport.h | 8 ++++---- src/devices/bus/bbc/joyport/joystick.cpp | 2 +- src/devices/bus/bbc/joyport/joystick.h | 2 +- src/devices/bus/bbc/userport/beebspch.cpp | 2 +- src/devices/bus/bbc/userport/beebspch.h | 2 +- src/devices/bus/bbc/userport/cfa3000kbd.cpp | 2 +- src/devices/bus/bbc/userport/cfa3000kbd.h | 2 +- src/devices/bus/bbc/userport/pointer.cpp | 6 +++--- src/devices/bus/bbc/userport/pointer.h | 6 +++--- src/devices/bus/bbc/userport/userport.cpp | 8 ++++---- src/devices/bus/bbc/userport/userport.h | 8 ++++---- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/devices/bus/bbc/exp/mertec.cpp b/src/devices/bus/bbc/exp/mertec.cpp index f3e2187ecd5..23e1ec4d993 100644 --- a/src/devices/bus/bbc/exp/mertec.cpp +++ b/src/devices/bus/bbc/exp/mertec.cpp @@ -156,10 +156,10 @@ WRITE8_MEMBER(bbc_mertec_device::sheila_w) READ8_MEMBER(bbc_mertec_device::pb_r) { - return m_userport->pb_r(space, 0); + return m_userport->pb_r(); } WRITE8_MEMBER(bbc_mertec_device::pb_w) { - m_userport->pb_w(space, 0, data); + m_userport->pb_w(data); } diff --git a/src/devices/bus/bbc/joyport/joyport.cpp b/src/devices/bus/bbc/joyport/joyport.cpp index 5ed3f8d2fff..0c1bae50ee2 100644 --- a/src/devices/bus/bbc/joyport/joyport.cpp +++ b/src/devices/bus/bbc/joyport/joyport.cpp @@ -91,11 +91,11 @@ void bbc_joyport_slot_device::device_reset() // pb_r //------------------------------------------------- -READ8_MEMBER(bbc_joyport_slot_device::pb_r) +uint8_t bbc_joyport_slot_device::pb_r() { // TODO: Joyport connected to PB0-PB4 only. PB5-PB7 are expansion port. if (m_device) - return 0xe0 | m_device->pb_r(space, 0); + return 0xe0 | m_device->pb_r(); else return 0xff; } @@ -105,10 +105,10 @@ READ8_MEMBER(bbc_joyport_slot_device::pb_r) // pb_w //------------------------------------------------- -WRITE8_MEMBER(bbc_joyport_slot_device::pb_w) +void bbc_joyport_slot_device::pb_w(uint8_t data) { if (m_device) - m_device->pb_w(space, 0, data); + m_device->pb_w(data); } diff --git a/src/devices/bus/bbc/joyport/joyport.h b/src/devices/bus/bbc/joyport/joyport.h index 572e41f7612..6abda62633d 100644 --- a/src/devices/bus/bbc/joyport/joyport.h +++ b/src/devices/bus/bbc/joyport/joyport.h @@ -64,8 +64,8 @@ public: DECLARE_WRITE_LINE_MEMBER(cb1_w) { m_cb1_handler(state); } DECLARE_WRITE_LINE_MEMBER(cb2_w) { m_cb2_handler(state); } - DECLARE_READ8_MEMBER(pb_r); - DECLARE_WRITE8_MEMBER(pb_w); + uint8_t pb_r(); + void pb_w(uint8_t data); protected: // device-level overrides @@ -86,8 +86,8 @@ private: class device_bbc_joyport_interface : public device_slot_card_interface { public: - virtual DECLARE_READ8_MEMBER(pb_r) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(pb_w) { } + virtual uint8_t pb_r() { return 0xff; } + virtual void pb_w(uint8_t data) { } protected: device_bbc_joyport_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/bbc/joyport/joystick.cpp b/src/devices/bus/bbc/joyport/joystick.cpp index 5f4047c13a3..d53186f118d 100644 --- a/src/devices/bus/bbc/joyport/joystick.cpp +++ b/src/devices/bus/bbc/joyport/joystick.cpp @@ -78,7 +78,7 @@ void bbcmc_joystick_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(bbcmc_joystick_device::pb_r) +uint8_t bbcmc_joystick_device::pb_r() { return m_joy->read(); } diff --git a/src/devices/bus/bbc/joyport/joystick.h b/src/devices/bus/bbc/joyport/joystick.h index 0e9cea22716..8d0cc5a0458 100644 --- a/src/devices/bus/bbc/joyport/joystick.h +++ b/src/devices/bus/bbc/joyport/joystick.h @@ -36,7 +36,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual DECLARE_READ8_MEMBER(pb_r) override; + virtual uint8_t pb_r() override; private: required_ioport m_joy; diff --git a/src/devices/bus/bbc/userport/beebspch.cpp b/src/devices/bus/bbc/userport/beebspch.cpp index 291179b54c6..728d8ae6658 100644 --- a/src/devices/bus/bbc/userport/beebspch.cpp +++ b/src/devices/bus/bbc/userport/beebspch.cpp @@ -82,7 +82,7 @@ void bbc_beebspch_device::device_start() // IMPLEMENTATION //************************************************************************** -WRITE8_MEMBER(bbc_beebspch_device::pb_w) +void bbc_beebspch_device::pb_w(uint8_t data) { switch (data & 0xc0) { diff --git a/src/devices/bus/bbc/userport/beebspch.h b/src/devices/bus/bbc/userport/beebspch.h index 94c36b0cc84..79e6abf64ab 100644 --- a/src/devices/bus/bbc/userport/beebspch.h +++ b/src/devices/bus/bbc/userport/beebspch.h @@ -38,7 +38,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; - virtual DECLARE_WRITE8_MEMBER(pb_w) override; + virtual void pb_w(uint8_t data) override; private: required_device m_nsp; diff --git a/src/devices/bus/bbc/userport/cfa3000kbd.cpp b/src/devices/bus/bbc/userport/cfa3000kbd.cpp index d07d7b6dd2f..5b2d5586f56 100644 --- a/src/devices/bus/bbc/userport/cfa3000kbd.cpp +++ b/src/devices/bus/bbc/userport/cfa3000kbd.cpp @@ -113,7 +113,7 @@ void cfa3000_kbd_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(cfa3000_kbd_device::pb_r) +uint8_t cfa3000_kbd_device::pb_r() { uint8_t data = 0x00; diff --git a/src/devices/bus/bbc/userport/cfa3000kbd.h b/src/devices/bus/bbc/userport/cfa3000kbd.h index 2ece3cbf380..ff9951399c8 100644 --- a/src/devices/bus/bbc/userport/cfa3000kbd.h +++ b/src/devices/bus/bbc/userport/cfa3000kbd.h @@ -36,7 +36,7 @@ protected: // optional information overrides virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_READ8_MEMBER(pb_r) override; + virtual uint8_t pb_r() override; private: required_ioport_array<4> m_kbd; diff --git a/src/devices/bus/bbc/userport/pointer.cpp b/src/devices/bus/bbc/userport/pointer.cpp index 9a222388989..d8272766d98 100644 --- a/src/devices/bus/bbc/userport/pointer.cpp +++ b/src/devices/bus/bbc/userport/pointer.cpp @@ -261,17 +261,17 @@ TIMER_CALLBACK_MEMBER(bbc_pointer_device::pointer_poll) } } -READ8_MEMBER(bbc_amxmouse_device::pb_r) +uint8_t bbc_amxmouse_device::pb_r() { return (m_buttons->read() & 0xe0) | (m_xdir << 0) | (m_ydir << 2) | 0x1a; } -READ8_MEMBER(bbc_m512mouse_device::pb_r) +uint8_t bbc_m512mouse_device::pb_r() { return (m_buttons->read() & 0x07) | (m_xdir << 3) | (m_ydir << 4) | 0xe0; } -READ8_MEMBER(bbc_tracker_device::pb_r) +uint8_t bbc_tracker_device::pb_r() { return (m_buttons->read() & 0x07) | (m_xdir << 3) | (m_ydir << 4) | 0xe0; } diff --git a/src/devices/bus/bbc/userport/pointer.h b/src/devices/bus/bbc/userport/pointer.h index 5551a2c82dd..a6e1bd0a629 100644 --- a/src/devices/bus/bbc/userport/pointer.h +++ b/src/devices/bus/bbc/userport/pointer.h @@ -58,7 +58,7 @@ public: // construction/destruction bbc_amxmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(pb_r) override; + uint8_t pb_r() override; // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -73,7 +73,7 @@ public: // construction/destruction bbc_m512mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(pb_r) override; + uint8_t pb_r() override; // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -88,7 +88,7 @@ public: // construction/destruction bbc_tracker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(pb_r) override; + uint8_t pb_r() override; // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/bbc/userport/userport.cpp b/src/devices/bus/bbc/userport/userport.cpp index a4610217651..601a6845801 100644 --- a/src/devices/bus/bbc/userport/userport.cpp +++ b/src/devices/bus/bbc/userport/userport.cpp @@ -89,10 +89,10 @@ void bbc_userport_slot_device::device_reset() // pb_r //------------------------------------------------- -READ8_MEMBER(bbc_userport_slot_device::pb_r) +uint8_t bbc_userport_slot_device::pb_r() { if (m_device) - return m_device->pb_r(space, 0); + return m_device->pb_r(); else return 0xff; } @@ -102,10 +102,10 @@ READ8_MEMBER(bbc_userport_slot_device::pb_r) // pb_w //------------------------------------------------- -WRITE8_MEMBER(bbc_userport_slot_device::pb_w) +void bbc_userport_slot_device::pb_w(uint8_t data) { if (m_device) - m_device->pb_w(space, 0, data); + m_device->pb_w(data); } diff --git a/src/devices/bus/bbc/userport/userport.h b/src/devices/bus/bbc/userport/userport.h index e2807146efe..e3040283a5a 100644 --- a/src/devices/bus/bbc/userport/userport.h +++ b/src/devices/bus/bbc/userport/userport.h @@ -64,8 +64,8 @@ public: DECLARE_WRITE_LINE_MEMBER(cb1_w) { m_cb1_handler(state); } DECLARE_WRITE_LINE_MEMBER(cb2_w) { m_cb2_handler(state); } - DECLARE_READ8_MEMBER(pb_r); - DECLARE_WRITE8_MEMBER(pb_w); + uint8_t pb_r(); + void pb_w(uint8_t data); protected: // device-level overrides @@ -88,8 +88,8 @@ public: // construction/destruction virtual ~device_bbc_userport_interface(); - virtual DECLARE_READ8_MEMBER(pb_r) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(pb_w) { } + virtual uint8_t pb_r() { return 0xff; } + virtual void pb_w(uint8_t data) { } protected: device_bbc_userport_interface(const machine_config &mconfig, device_t &device); -- cgit v1.2.3