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/bus/ql/opd_basic_master.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/ql/opd_basic_master.cpp')
-rw-r--r-- | src/devices/bus/ql/opd_basic_master.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/bus/ql/opd_basic_master.cpp b/src/devices/bus/ql/opd_basic_master.cpp index b3b6f18dc19..015fca91a37 100644 --- a/src/devices/bus/ql/opd_basic_master.cpp +++ b/src/devices/bus/ql/opd_basic_master.cpp @@ -67,7 +67,7 @@ void opd_basic_master_device::device_start() // read - //------------------------------------------------- -uint8_t opd_basic_master_device::read(offs_t offset, uint8_t data) +uint8_t opd_basic_master_device::read(address_space &space, offs_t offset, uint8_t data) { return data; } @@ -77,6 +77,6 @@ uint8_t opd_basic_master_device::read(offs_t offset, uint8_t data) // write - //------------------------------------------------- -void opd_basic_master_device::write(offs_t offset, uint8_t data) +void opd_basic_master_device::write(address_space &space, offs_t offset, uint8_t data) { } |