diff options
Diffstat (limited to 'src/mame/machine/ns11prot.h')
-rw-r--r-- | src/mame/machine/ns11prot.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/machine/ns11prot.h b/src/mame/machine/ns11prot.h index f45eca27b7e..3622d323f34 100644 --- a/src/mame/machine/ns11prot.h +++ b/src/mame/machine/ns11prot.h @@ -23,8 +23,8 @@ protected: uint16_t m_p3; public: - virtual DECLARE_READ16_MEMBER( read ) = 0; - virtual DECLARE_WRITE16_MEMBER( write ) = 0; + virtual uint16_t read(offs_t offset) = 0; + virtual void write(offs_t offset, uint16_t data) = 0; }; /* tekken 2 */ @@ -34,8 +34,8 @@ class keycus_c406_device : public ns11_keycus_device public: keycus_c406_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C406, keycus_c406_device) @@ -47,8 +47,8 @@ class keycus_c409_device : public ns11_keycus_device public: keycus_c409_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C409, keycus_c409_device) @@ -60,8 +60,8 @@ class keycus_c410_device : public ns11_keycus_device public: keycus_c410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C410, keycus_c410_device) @@ -73,8 +73,8 @@ class keycus_c411_device : public ns11_keycus_device public: keycus_c411_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C411, keycus_c411_device) @@ -86,8 +86,8 @@ class keycus_c430_device : public ns11_keycus_device public: keycus_c430_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C430, keycus_c430_device) @@ -99,8 +99,8 @@ class keycus_c431_device : public ns11_keycus_device public: keycus_c431_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C431, keycus_c431_device) @@ -112,8 +112,8 @@ class keycus_c432_device : public ns11_keycus_device public: keycus_c432_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C432, keycus_c432_device) @@ -125,8 +125,8 @@ class keycus_c442_device : public ns11_keycus_device public: keycus_c442_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C442, keycus_c442_device) @@ -138,8 +138,8 @@ class keycus_c443_device : public ns11_keycus_device public: keycus_c443_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER( read ) override; - virtual DECLARE_WRITE16_MEMBER( write ) override; + virtual uint16_t read(offs_t offset) override; + virtual void write(offs_t offset, uint16_t data) override; }; DECLARE_DEVICE_TYPE(KEYCUS_C443, keycus_c443_device) |