diff options
Diffstat (limited to 'src/devices/bus/psx/parallel.h')
-rw-r--r-- | src/devices/bus/psx/parallel.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/devices/bus/psx/parallel.h b/src/devices/bus/psx/parallel.h index fc478149547..7d75093a34d 100644 --- a/src/devices/bus/psx/parallel.h +++ b/src/devices/bus/psx/parallel.h @@ -14,7 +14,7 @@ class psx_parallel_interface; -class psx_parallel_slot_device : public device_t, public device_slot_interface +class psx_parallel_slot_device : public device_t, public device_single_card_slot_interface<psx_parallel_interface> { public: // construction/destruction @@ -30,36 +30,31 @@ public: psx_parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~psx_parallel_slot_device(); - DECLARE_READ16_MEMBER(exp_r); - DECLARE_WRITE16_MEMBER(exp_w); + uint16_t exp_r(offs_t offset); + void exp_w(offs_t offset, uint16_t data); - const bool hascard() const - { - return bool(m_card); - }; + bool hascard() const { return bool(m_card); } protected: // device-level overrides - virtual void device_start() override; - virtual void device_reset() override; - - psx_parallel_interface *m_card; + virtual void device_start() override ATTR_COLD; private: + psx_parallel_interface *m_card; }; // ======================> psx_parallel_interface -class psx_parallel_interface : public device_slot_card_interface +class psx_parallel_interface : public device_interface { public: // construction/destruction virtual ~psx_parallel_interface(); // reading and writing - virtual DECLARE_READ16_MEMBER(exp_r) { return 0xff; } - virtual DECLARE_WRITE16_MEMBER(exp_w) { } + virtual uint16_t exp_r(offs_t offset, uint16_t mem_mask = ~0) { return 0xff; } + virtual void exp_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { } protected: psx_parallel_interface(const machine_config &mconfig, device_t &device); |