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/machine/strata.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/strata.h')
-rw-r--r-- | src/devices/machine/strata.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/machine/strata.h b/src/devices/machine/strata.h index 1a3acbbd9dd..26d8675f436 100644 --- a/src/devices/machine/strata.h +++ b/src/devices/machine/strata.h @@ -12,12 +12,12 @@ public: strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // 8-bit access - uint8_t read8(offs_t offset); - void write8(offs_t offset, uint8_t data); + DECLARE_READ8_MEMBER( read8 ); + DECLARE_WRITE8_MEMBER( write8 ); // 16-bit access - uint16_t read16(offs_t offset); - void write16(offs_t offset, uint16_t data); + DECLARE_READ16_MEMBER( read16 ); + DECLARE_WRITE16_MEMBER( write16 ); protected: // device-level overrides @@ -36,8 +36,8 @@ private: bw_16 }; - uint16_t read8_16(offs_t offset, bus_width_t bus_width); - void write8_16(offs_t offset, uint16_t data, bus_width_t bus_width); + uint16_t read8_16(address_space& space, offs_t offset, bus_width_t bus_width); + void write8_16(address_space& space, offs_t offset, uint16_t data, bus_width_t bus_width); enum fm_mode_t { |