diff options
Diffstat (limited to 'src/devices/bus/cbm2/user.h')
-rw-r--r-- | src/devices/bus/cbm2/user.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h index 6bb6bba33c6..aa963d0dccc 100644 --- a/src/devices/bus/cbm2/user.h +++ b/src/devices/bus/cbm2/user.h @@ -42,20 +42,20 @@ class cbm2_user_port_device; class device_cbm2_user_port_interface : public device_slot_card_interface { public: - virtual uint8_t cbm2_d1_r() { return 0xff; } - virtual void cbm2_d1_w(uint8_t data) { } + virtual uint8_t cbm2_d1_r(address_space &space, offs_t offset) { return 0xff; }; + virtual void cbm2_d1_w(address_space &space, offs_t offset, uint8_t data) { }; - virtual uint8_t cbm2_d2_r() { return 0xff; } - virtual void cbm2_d2_w(uint8_t data) { } + virtual uint8_t cbm2_d2_r(address_space &space, offs_t offset) { return 0xff; }; + virtual void cbm2_d2_w(address_space &space, offs_t offset, uint8_t data) { }; virtual int cbm2_pb2_r() { return 1; } - virtual void cbm2_pb2_w(int state) { } + virtual void cbm2_pb2_w(int state) { }; virtual int cbm2_pb3_r() { return 1; } - virtual void cbm2_pb3_w(int state) { } + virtual void cbm2_pb3_w(int state) { }; - virtual void cbm2_pc_w(int state) { } - virtual void cbm2_cnt_w(int state) { } - virtual void cbm2_sp_w(int state) { } + virtual void cbm2_pc_w(int state) { }; + virtual void cbm2_cnt_w(int state) { }; + virtual void cbm2_sp_w(int state) { }; protected: // construction/destruction @@ -89,10 +89,10 @@ public: auto flag_callback() { return m_write_flag.bind(); } // computer interface - uint8_t d1_r() { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d1_r(); return data; } - void d1_w(uint8_t data) { if (m_card != nullptr) m_card->cbm2_d1_w(data); } - uint8_t d2_r() { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d2_r(); return data; } - void d2_w(uint8_t data) { if (m_card != nullptr) m_card->cbm2_d2_w(data); } + DECLARE_READ8_MEMBER( d1_r ) { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d1_r(space, offset); return data; } + DECLARE_WRITE8_MEMBER( d1_w ) { if (m_card != nullptr) m_card->cbm2_d1_w(space, offset, data); } + DECLARE_READ8_MEMBER( d2_r ) { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d2_r(space, offset); return data; } + DECLARE_WRITE8_MEMBER( d2_w ) { if (m_card != nullptr) m_card->cbm2_d2_w(space, offset, data); } DECLARE_READ_LINE_MEMBER( pb2_r ) { return m_card ? m_card->cbm2_pb2_r() : 1; } DECLARE_WRITE_LINE_MEMBER( pb2_w ) { if (m_card != nullptr) m_card->cbm2_pb2_w(state); } DECLARE_READ_LINE_MEMBER( pb3_r ) { return m_card ? m_card->cbm2_pb3_r() : 1; } |