summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/generic/rom.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/generic/rom.h
parent009cba4fb8102102168ef32870892438327f3705 (diff)
parent598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff)
conflict resolution (nw)
Diffstat (limited to 'src/devices/bus/generic/rom.h')
-rw-r--r--src/devices/bus/generic/rom.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/bus/generic/rom.h b/src/devices/bus/generic/rom.h
index 2fc1011c25b..6c5df5d4bf4 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 DECLARE_READ8_MEMBER(read_rom) override;
- virtual DECLARE_READ16_MEMBER(read16_rom) override;
- virtual DECLARE_READ32_MEMBER(read32_rom) override;
+ 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;
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 DECLARE_READ8_MEMBER(read_ram) override;
- virtual DECLARE_WRITE8_MEMBER(write_ram) override;
+ virtual uint8_t read_ram(offs_t offset) override;
+ virtual void write_ram(offs_t offset, uint8_t data) 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 DECLARE_READ8_MEMBER(read_rom) override;
- virtual DECLARE_READ16_MEMBER(read16_rom) override;
- virtual DECLARE_READ32_MEMBER(read32_rom) override;
+ 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;
};