summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nes/ggenie.h
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
commitc24473ddff715ecec2e258a6eb38960cf8c8e98e (patch)
tree8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/bus/nes/ggenie.h
parent009cba4fb8102102168ef32870892438327f3705 (diff)
parent598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff)
conflict resolution (nw)
Diffstat (limited to 'src/devices/bus/nes/ggenie.h')
-rw-r--r--src/devices/bus/nes/ggenie.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/bus/nes/ggenie.h b/src/devices/bus/nes/ggenie.h
index 1ca577ec7b0..2d6974be849 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 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;
+ 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;
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); }