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/generic/rom.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/devices/bus/generic/rom.h') diff --git a/src/devices/bus/generic/rom.h b/src/devices/bus/generic/rom.h index 6c5df5d4bf4..2fc1011c25b 100644 --- a/src/devices/bus/generic/rom.h +++ b/src/devices/bus/generic/rom.h @@ -30,9 +30,9 @@ public: generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual uint8_t read_rom(offs_t offset) override; - virtual uint16_t read16_rom(offs_t offset, uint16_t mem_mask) override; - virtual uint32_t read32_rom(offs_t offset, uint32_t mem_mask) override; + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_READ16_MEMBER(read16_rom) override; + virtual DECLARE_READ32_MEMBER(read32_rom) override; protected: generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -48,8 +48,8 @@ public: generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual uint8_t read_ram(offs_t offset) override; - virtual void write_ram(offs_t offset, uint8_t data) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; @@ -62,9 +62,9 @@ public: generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual uint8_t read_rom(offs_t offset) override; - virtual uint16_t read16_rom(offs_t offset, uint16_t mem_mask) override; - virtual uint32_t read32_rom(offs_t offset, uint32_t mem_mask) override; + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_READ16_MEMBER(read16_rom) override; + virtual DECLARE_READ32_MEMBER(read32_rom) override; }; -- cgit v1.2.3-70-g09d2