diff options
author | 2019-02-19 13:55:56 -0500 | |
---|---|---|
committer | 2019-02-19 13:55:56 -0500 | |
commit | a9f1509511c061ef6fee02790da262e68fde06bd (patch) | |
tree | cca428bf024bee0373666e20068070f5a90b9ca5 /src/devices/bus/newbrain | |
parent | 48563c34f26532a10b2b8030997ab37b0d9760a4 (diff) |
bus/newbrain, bus/tiki100, wd2010: Simplify read/write handlers (nw)
Diffstat (limited to 'src/devices/bus/newbrain')
-rw-r--r-- | src/devices/bus/newbrain/eim.cpp | 16 | ||||
-rw-r--r-- | src/devices/bus/newbrain/eim.h | 8 | ||||
-rw-r--r-- | src/devices/bus/newbrain/exp.cpp | 16 | ||||
-rw-r--r-- | src/devices/bus/newbrain/exp.h | 16 | ||||
-rw-r--r-- | src/devices/bus/newbrain/fdc.cpp | 24 | ||||
-rw-r--r-- | src/devices/bus/newbrain/fdc.h | 14 |
6 files changed, 47 insertions, 47 deletions
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index f28b2af5360..3f0b7a19ee0 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -145,9 +145,9 @@ void newbrain_eim_device::device_reset() // mreq_r - memory request read //------------------------------------------------- -uint8_t newbrain_eim_device::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) +uint8_t newbrain_eim_device::mreq_r(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { - return m_exp->mreq_r(space, offset, data, romov, exrm, raminh); + return m_exp->mreq_r(offset, data, romov, exrm, raminh); } @@ -155,9 +155,9 @@ uint8_t newbrain_eim_device::mreq_r(address_space &space, offs_t offset, uint8_t // mreq_w - memory request write //------------------------------------------------- -void newbrain_eim_device::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) +void newbrain_eim_device::mreq_w(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { - m_exp->mreq_w(space, offset, data, romov, exrm, raminh); + m_exp->mreq_w(offset, data, romov, exrm, raminh); } @@ -165,9 +165,9 @@ void newbrain_eim_device::mreq_w(address_space &space, offs_t offset, uint8_t da // iorq_r - I/O request read //------------------------------------------------- -uint8_t newbrain_eim_device::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) +uint8_t newbrain_eim_device::iorq_r(offs_t offset, uint8_t data, bool &prtov) { - return m_exp->iorq_r(space, offset, data, prtov); + return m_exp->iorq_r(offset, data, prtov); } @@ -175,9 +175,9 @@ uint8_t newbrain_eim_device::iorq_r(address_space &space, offs_t offset, uint8_t // iorq_w - I/O request write //------------------------------------------------- -void newbrain_eim_device::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) +void newbrain_eim_device::iorq_w(offs_t offset, uint8_t data, bool &prtov) { - m_exp->iorq_w(space, offset, data, prtov); + m_exp->iorq_w(offset, data, prtov); } diff --git a/src/devices/bus/newbrain/eim.h b/src/devices/bus/newbrain/eim.h index 3e83b22112e..19b456338fd 100644 --- a/src/devices/bus/newbrain/eim.h +++ b/src/devices/bus/newbrain/eim.h @@ -48,10 +48,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_newbrain_expansion_slot_interface overrides - virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; - virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; - virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; - virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; + virtual uint8_t mreq_r(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; + virtual void mreq_w(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; + virtual uint8_t iorq_r(offs_t offset, uint8_t data, bool &prtov) override; + virtual void iorq_w(offs_t offset, uint8_t data, bool &prtov) override; private: DECLARE_WRITE_LINE_MEMBER( acia_interrupt ); diff --git a/src/devices/bus/newbrain/exp.cpp b/src/devices/bus/newbrain/exp.cpp index b4675c3b89f..a1a9e2210ed 100644 --- a/src/devices/bus/newbrain/exp.cpp +++ b/src/devices/bus/newbrain/exp.cpp @@ -77,11 +77,11 @@ void newbrain_expansion_slot_device::device_reset() // mreq_r - memory request read //------------------------------------------------- -uint8_t newbrain_expansion_slot_device::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) +uint8_t newbrain_expansion_slot_device::mreq_r(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { if (m_card != nullptr) { - data = m_card->mreq_r(space, offset, data, romov, exrm, raminh); + data = m_card->mreq_r(offset, data, romov, exrm, raminh); } return data; @@ -92,11 +92,11 @@ uint8_t newbrain_expansion_slot_device::mreq_r(address_space &space, offs_t offs // mreq_w - memory request write //------------------------------------------------- -void newbrain_expansion_slot_device::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) +void newbrain_expansion_slot_device::mreq_w(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { if (m_card != nullptr) { - m_card->mreq_w(space, offset, data, romov, exrm, raminh); + m_card->mreq_w(offset, data, romov, exrm, raminh); } } @@ -105,11 +105,11 @@ void newbrain_expansion_slot_device::mreq_w(address_space &space, offs_t offset, // iorq_r - I/O request read //------------------------------------------------- -uint8_t newbrain_expansion_slot_device::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) +uint8_t newbrain_expansion_slot_device::iorq_r(offs_t offset, uint8_t data, bool &prtov) { if (m_card != nullptr) { - data = m_card->iorq_r(space, offset, data, prtov); + data = m_card->iorq_r(offset, data, prtov); } return data; @@ -120,11 +120,11 @@ uint8_t newbrain_expansion_slot_device::iorq_r(address_space &space, offs_t offs // iorq_w - I/O request write //------------------------------------------------- -void newbrain_expansion_slot_device::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) +void newbrain_expansion_slot_device::iorq_w(offs_t offset, uint8_t data, bool &prtov) { if (m_card != nullptr) { - m_card->iorq_w(space, offset, data, prtov); + m_card->iorq_w(offset, data, prtov); } } diff --git a/src/devices/bus/newbrain/exp.h b/src/devices/bus/newbrain/exp.h index 26655d76410..e9e56c1bd66 100644 --- a/src/devices/bus/newbrain/exp.h +++ b/src/devices/bus/newbrain/exp.h @@ -75,11 +75,11 @@ public: newbrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // computer interface - uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh); - void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh); + uint8_t mreq_r(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh); + void mreq_w(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh); - uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov); - void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov); + uint8_t iorq_r(offs_t offset, uint8_t data, bool &prtov); + void iorq_w(offs_t offset, uint8_t data, bool &prtov); protected: // device-level overrides @@ -97,12 +97,12 @@ class device_newbrain_expansion_slot_interface : public device_slot_card_interfa { public: // memory access - virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { return data; } - virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { } + virtual uint8_t mreq_r(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { return data; } + virtual void mreq_w(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { } // I/O access - virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { return data; } - virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { } + virtual uint8_t iorq_r(offs_t offset, uint8_t data, bool &prtov) { return data; } + virtual void iorq_w(offs_t offset, uint8_t data, bool &prtov) { } protected: // construction/destruction diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp index 238109153e5..7cadbd0bddd 100644 --- a/src/devices/bus/newbrain/fdc.cpp +++ b/src/devices/bus/newbrain/fdc.cpp @@ -177,9 +177,9 @@ void newbrain_fdc_device::device_reset() // mreq_r - memory request read //------------------------------------------------- -uint8_t newbrain_fdc_device::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) +uint8_t newbrain_fdc_device::mreq_r(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { - return m_exp->mreq_r(space, offset, data, romov, exrm, raminh); + return m_exp->mreq_r(offset, data, romov, exrm, raminh); } @@ -187,9 +187,9 @@ uint8_t newbrain_fdc_device::mreq_r(address_space &space, offs_t offset, uint8_t // mreq_w - memory request write //------------------------------------------------- -void newbrain_fdc_device::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) +void newbrain_fdc_device::mreq_w(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { - m_exp->mreq_w(space, offset, data, romov, exrm, raminh); + m_exp->mreq_w(offset, data, romov, exrm, raminh); } @@ -197,9 +197,9 @@ void newbrain_fdc_device::mreq_w(address_space &space, offs_t offset, uint8_t da // iorq_r - I/O request read //------------------------------------------------- -uint8_t newbrain_fdc_device::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) +uint8_t newbrain_fdc_device::iorq_r(offs_t offset, uint8_t data, bool &prtov) { - return m_exp->iorq_r(space, offset, data, prtov); + return m_exp->iorq_r(offset, data, prtov); } @@ -207,13 +207,13 @@ uint8_t newbrain_fdc_device::iorq_r(address_space &space, offs_t offset, uint8_t // iorq_w - I/O request write //------------------------------------------------- -void newbrain_fdc_device::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) +void newbrain_fdc_device::iorq_w(offs_t offset, uint8_t data, bool &prtov) { - m_exp->iorq_w(space, offset, data, prtov); + m_exp->iorq_w(offset, data, prtov); if ((offset & 0x20f) == 0x20f) { - io_dec_w(space, 0, data); + io_dec_w(data); } } @@ -245,7 +245,7 @@ WRITE_LINE_MEMBER( newbrain_fdc_device::fdc_int_w ) // fdc_auxiliary_w - //------------------------------------------------- -WRITE8_MEMBER( newbrain_fdc_device::fdc_auxiliary_w ) +void newbrain_fdc_device::fdc_auxiliary_w(uint8_t data) { /* @@ -279,7 +279,7 @@ WRITE8_MEMBER( newbrain_fdc_device::fdc_auxiliary_w ) // fdc_control_r - //------------------------------------------------- -READ8_MEMBER( newbrain_fdc_device::fdc_control_r ) +uint8_t newbrain_fdc_device::fdc_control_r() { /* @@ -304,7 +304,7 @@ READ8_MEMBER( newbrain_fdc_device::fdc_control_r ) // io_dec_w - 0x20f //------------------------------------------------- -WRITE8_MEMBER( newbrain_fdc_device::io_dec_w ) +void newbrain_fdc_device::io_dec_w(uint8_t data) { /* diff --git a/src/devices/bus/newbrain/fdc.h b/src/devices/bus/newbrain/fdc.h index e5a40ae0748..e5d6665a078 100644 --- a/src/devices/bus/newbrain/fdc.h +++ b/src/devices/bus/newbrain/fdc.h @@ -40,17 +40,17 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_newbrain_expansion_slot_interface overrides - virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; - virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; - virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; - virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) override; + virtual uint8_t mreq_r(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; + virtual void mreq_w(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) override; + virtual uint8_t iorq_r(offs_t offset, uint8_t data, bool &prtov) override; + virtual void iorq_w(offs_t offset, uint8_t data, bool &prtov) override; private: DECLARE_WRITE_LINE_MEMBER( fdc_int_w ); - DECLARE_WRITE8_MEMBER( fdc_auxiliary_w ); - DECLARE_READ8_MEMBER( fdc_control_r ); - DECLARE_WRITE8_MEMBER( io_dec_w ); + void fdc_auxiliary_w(uint8_t data); + uint8_t fdc_control_r(); + void io_dec_w(uint8_t data); void newbrain_fdc_io(address_map &map); void newbrain_fdc_mem(address_map &map); |