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/ggenie.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/nes/ggenie.h')
-rw-r--r-- | src/devices/bus/nes/ggenie.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/bus/nes/ggenie.h b/src/devices/bus/nes/ggenie.h index 2d6974be849..1ca577ec7b0 100644 --- a/src/devices/bus/nes/ggenie.h +++ b/src/devices/bus/nes/ggenie.h @@ -16,17 +16,17 @@ public: // construction/destruction nes_ggenie_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 uint8_t read_h(offs_t offset) override; - virtual void write_l(offs_t offset, uint8_t data) override; - virtual void write_m(offs_t offset, uint8_t data) override; - virtual void write_h(offs_t offset, uint8_t data) override; - - virtual uint8_t chr_r(offs_t offset) override; - virtual void chr_w(offs_t offset, uint8_t data) override; - virtual uint8_t nt_r(offs_t offset) override; - virtual void nt_w(offs_t offset, uint8_t data) override; + virtual DECLARE_READ8_MEMBER(read_l) override; + virtual DECLARE_READ8_MEMBER(read_m) override; + virtual DECLARE_READ8_MEMBER(read_h) override; + virtual DECLARE_WRITE8_MEMBER(write_l) override; + virtual DECLARE_WRITE8_MEMBER(write_m) override; + virtual DECLARE_WRITE8_MEMBER(write_h) override; + + virtual DECLARE_READ8_MEMBER(chr_r) override; + virtual DECLARE_WRITE8_MEMBER(chr_w) override; + virtual DECLARE_READ8_MEMBER(nt_r) override; + virtual DECLARE_WRITE8_MEMBER(nt_w) override; void hblank_irq(int scanline, int vblank, int blanked) override { if (m_gg_bypass && m_ggslot->m_cart) m_ggslot->m_cart->hblank_irq(scanline, vblank, blanked); } void scanline_irq(int scanline, int vblank, int blanked) override { if (m_gg_bypass && m_ggslot->m_cart) m_ggslot->m_cart->scanline_irq(scanline, vblank, blanked); } |