diff options
author | 2020-06-18 20:13:33 +0200 | |
---|---|---|
committer | 2020-06-18 20:13:33 +0200 | |
commit | 57cf17dc52bcd4571a68576dd6597ddf9fae41a8 (patch) | |
tree | 9fef8bce07d80de37886a6dc44c340da05517388 /src/devices/bus/wangpc | |
parent | e96ed3b0ebd5920e8aff2914a6ff28b435210717 (diff) |
finally retired the READ8/16/32/64 and WRITE8/16/32/64 macros (nw)
Diffstat (limited to 'src/devices/bus/wangpc')
-rw-r--r-- | src/devices/bus/wangpc/wdc.cpp | 20 | ||||
-rw-r--r-- | src/devices/bus/wangpc/wdc.h | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index 8b816a50ece..ddb6d07163b 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -292,7 +292,7 @@ bool wangpc_wdc_device::wangpcbus_have_dack(int line) // port_r - //------------------------------------------------- -READ8_MEMBER( wangpc_wdc_device::port_r ) +uint8_t wangpc_wdc_device::port_r() { /* @@ -317,7 +317,7 @@ READ8_MEMBER( wangpc_wdc_device::port_r ) // status_w - status register write //------------------------------------------------- -WRITE8_MEMBER( wangpc_wdc_device::status_w ) +void wangpc_wdc_device::status_w(uint8_t data) { logerror("WDC status %02x\n", data); @@ -325,11 +325,11 @@ WRITE8_MEMBER( wangpc_wdc_device::status_w ) } -READ8_MEMBER( wangpc_wdc_device::ctc_ch0_r ) { return m_ctc->read(0); } -WRITE8_MEMBER( wangpc_wdc_device::ctc_ch0_w ) { m_ctc->write(0, data); } -READ8_MEMBER( wangpc_wdc_device::ctc_ch1_r ) { return m_ctc->read(1); } -WRITE8_MEMBER( wangpc_wdc_device::ctc_ch1_w ) { m_ctc->write(1, data); } -READ8_MEMBER( wangpc_wdc_device::ctc_ch2_r ) { return m_ctc->read(2); } -WRITE8_MEMBER( wangpc_wdc_device::ctc_ch2_w ) { m_ctc->write(2, data); } -READ8_MEMBER( wangpc_wdc_device::ctc_ch3_r ) { return m_ctc->read(3); } -WRITE8_MEMBER( wangpc_wdc_device::ctc_ch3_w ) { m_ctc->write(3, data); } +uint8_t wangpc_wdc_device::ctc_ch0_r() { return m_ctc->read(0); } +void wangpc_wdc_device::ctc_ch0_w(uint8_t data) { m_ctc->write(0, data); } +uint8_t wangpc_wdc_device::ctc_ch1_r() { return m_ctc->read(1); } +void wangpc_wdc_device::ctc_ch1_w(uint8_t data) { m_ctc->write(1, data); } +uint8_t wangpc_wdc_device::ctc_ch2_r() { return m_ctc->read(2); } +void wangpc_wdc_device::ctc_ch2_w(uint8_t data) { m_ctc->write(2, data); } +uint8_t wangpc_wdc_device::ctc_ch3_r() { return m_ctc->read(3); } +void wangpc_wdc_device::ctc_ch3_w(uint8_t data) { m_ctc->write(3, data); } diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h index c945ba6707d..cb09025e13e 100644 --- a/src/devices/bus/wangpc/wdc.h +++ b/src/devices/bus/wangpc/wdc.h @@ -50,16 +50,16 @@ protected: private: inline void set_irq(int state); - DECLARE_READ8_MEMBER( port_r ); - DECLARE_WRITE8_MEMBER( status_w ); - DECLARE_READ8_MEMBER( ctc_ch0_r ); - DECLARE_WRITE8_MEMBER( ctc_ch0_w ); - DECLARE_READ8_MEMBER( ctc_ch1_r ); - DECLARE_WRITE8_MEMBER( ctc_ch1_w ); - DECLARE_READ8_MEMBER( ctc_ch2_r ); - DECLARE_WRITE8_MEMBER( ctc_ch2_w ); - DECLARE_READ8_MEMBER( ctc_ch3_r ); - DECLARE_WRITE8_MEMBER( ctc_ch3_w ); + uint8_t port_r(); + void status_w(uint8_t data); + uint8_t ctc_ch0_r(); + void ctc_ch0_w(uint8_t data); + uint8_t ctc_ch1_r(); + void ctc_ch1_w(uint8_t data); + uint8_t ctc_ch2_r(); + void ctc_ch2_w(uint8_t data); + uint8_t ctc_ch3_r(); + void ctc_ch3_w(uint8_t data); void wangpc_wdc_io(address_map &map); void wangpc_wdc_mem(address_map &map); |