diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2019-03-09 09:30:28 -0500 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2019-03-09 09:30:28 -0500 |
commit | dfa1c468564e18833a93979681201a89cd733f0a (patch) | |
tree | e3ddcb7b7eb5e9a41dec0b213170247958e72cdf /src/devices/bus/svi3x8/expander/expander.h | |
parent | 7ae027684361152b513a96c01ac190853d8fd050 (diff) |
svi318, bus/svi318: Simplify read/write handlers; minor driver cleanup (nw)
Diffstat (limited to 'src/devices/bus/svi3x8/expander/expander.h')
-rw-r--r-- | src/devices/bus/svi3x8/expander/expander.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/devices/bus/svi3x8/expander/expander.h b/src/devices/bus/svi3x8/expander/expander.h index b832fece8dd..cc7e75f6332 100644 --- a/src/devices/bus/svi3x8/expander/expander.h +++ b/src/devices/bus/svi3x8/expander/expander.h @@ -81,14 +81,14 @@ public: DECLARE_WRITE_LINE_MEMBER( ctrl1_w ) { m_ctrl1_handler(state); } DECLARE_WRITE_LINE_MEMBER( ctrl2_w ) { m_ctrl2_handler(state); } - DECLARE_READ8_MEMBER( excs_r ) { return m_excsr_handler(space, offset); } - DECLARE_WRITE8_MEMBER( excs_w ) { m_excsw_handler(space, offset, data); } + uint8_t excs_r(offs_t offset) { return m_excsr_handler(offset); } + void excs_w(offs_t offset, uint8_t data) { m_excsw_handler(offset, data); } // called from host - DECLARE_READ8_MEMBER( mreq_r ); - DECLARE_WRITE8_MEMBER( mreq_w ); - DECLARE_READ8_MEMBER( iorq_r ); - DECLARE_WRITE8_MEMBER( iorq_w ); + uint8_t mreq_r(offs_t offset); + void mreq_w(offs_t offset, uint8_t data); + uint8_t iorq_r(offs_t offset); + void iorq_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( bk21_w ); DECLARE_WRITE_LINE_MEMBER( bk22_w ); @@ -121,10 +121,10 @@ public: // construction/destruction virtual ~device_svi_expander_interface(); - virtual DECLARE_READ8_MEMBER( mreq_r ) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER( mreq_w ) { } - virtual DECLARE_READ8_MEMBER( iorq_r ) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER( iorq_w ) { } + virtual uint8_t mreq_r(offs_t offset) { return 0xff; } + virtual void mreq_w(offs_t offset, uint8_t data) { } + virtual uint8_t iorq_r(offs_t offset) { return 0xff; } + virtual void iorq_w(offs_t offset, uint8_t data) { } virtual void bk21_w(int state) { } virtual void bk22_w(int state) { } |