From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/devices/bus/snes/rom21.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/devices/bus/snes/rom21.h') diff --git a/src/devices/bus/snes/rom21.h b/src/devices/bus/snes/rom21.h index fb9b0b6c65a..545e2457ef3 100644 --- a/src/devices/bus/snes/rom21.h +++ b/src/devices/bus/snes/rom21.h @@ -18,8 +18,8 @@ public: sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual uint8_t read_l(offs_t offset) override; - virtual uint8_t read_h(offs_t offset) override; + virtual DECLARE_READ8_MEMBER(read_l) override; + virtual DECLARE_READ8_MEMBER(read_h) override; protected: sns_rom21_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -38,8 +38,8 @@ public: sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual uint8_t chip_read(offs_t offset) override; - virtual void chip_write(offs_t offset, uint8_t data) override; + virtual DECLARE_READ8_MEMBER(chip_read) override; + virtual DECLARE_WRITE8_MEMBER(chip_write) override; protected: // S-RTC specific variables -- cgit v1.2.3-70-g09d2