diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/s100/mm65k16s.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/s100/mm65k16s.cpp')
-rw-r--r-- | src/devices/bus/s100/mm65k16s.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/bus/s100/mm65k16s.cpp b/src/devices/bus/s100/mm65k16s.cpp index ae098a2e29c..27cdc021d39 100644 --- a/src/devices/bus/s100/mm65k16s.cpp +++ b/src/devices/bus/s100/mm65k16s.cpp @@ -233,7 +233,7 @@ void s100_mm65k16s_device::device_reset() // s100_smemr_r - memory read //------------------------------------------------- -uint8_t s100_mm65k16s_device::s100_smemr_r(offs_t offset) +uint8_t s100_mm65k16s_device::s100_smemr_r(address_space &space, offs_t offset) { uint8_t data = 0xff; @@ -250,7 +250,7 @@ uint8_t s100_mm65k16s_device::s100_smemr_r(offs_t offset) // s100_mwrt_w - memory write //------------------------------------------------- -void s100_mm65k16s_device::s100_mwrt_w(offs_t offset, uint8_t data) +void s100_mm65k16s_device::s100_mwrt_w(address_space &space, offs_t offset, uint8_t data) { if (offset < 0xf800) { |