diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/nes/jy.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/nes/jy.h')
-rw-r--r-- | src/devices/bus/nes/jy.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/bus/nes/jy.h b/src/devices/bus/nes/jy.h index d318bfae60a..80be5d98631 100644 --- a/src/devices/bus/nes/jy.h +++ b/src/devices/bus/nes/jy.h @@ -16,13 +16,13 @@ public: // construction/destruction nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual uint8_t read_l(offs_t offset) override; - virtual uint8_t read_m(offs_t offset) override; - virtual void write_l(offs_t offset, uint8_t data) override; - virtual void write_h(offs_t offset, uint8_t data) override; + virtual DECLARE_READ8_MEMBER(read_l) override; + virtual DECLARE_READ8_MEMBER(read_m) override; + virtual DECLARE_WRITE8_MEMBER(write_l) override; + virtual DECLARE_WRITE8_MEMBER(write_h) override; - virtual uint8_t chr_r(offs_t offset) override; - virtual uint8_t nt_r(offs_t offset) override; + virtual DECLARE_READ8_MEMBER(chr_r) override; + virtual DECLARE_READ8_MEMBER(nt_r) override; virtual void scanline_irq(int scanline, int vblank, int blanked) override; virtual void pcb_reset() override; @@ -90,7 +90,7 @@ public: // construction/destruction nes_jy_typec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual uint8_t chr_r(offs_t offset) override; + virtual DECLARE_READ8_MEMBER(chr_r) override; protected: void update_mirror_typec(); |