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/ss50/interface.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/ss50/interface.cpp')
-rw-r--r-- | src/devices/bus/ss50/interface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/bus/ss50/interface.cpp b/src/devices/bus/ss50/interface.cpp index a811c790ef9..b17f54f9c68 100644 --- a/src/devices/bus/ss50/interface.cpp +++ b/src/devices/bus/ss50/interface.cpp @@ -139,22 +139,22 @@ void ss50_interface_port_device::device_start() // read - interface read access (pre-decoded) //------------------------------------------------- -u8 ss50_interface_port_device::read(offs_t offset) +READ8_MEMBER(ss50_interface_port_device::read) { if (m_card == nullptr) { logerror("%s: Read from unspecified interface (RS = %X)\n", machine().describe_context(), offset); - return 0xff; + return space.unmap(); } - return m_card->register_read(offset); + return m_card->register_read(space, offset); } //------------------------------------------------- // write - interface write access (pre-decoded) //------------------------------------------------- -void ss50_interface_port_device::write(offs_t offset, u8 data) +WRITE8_MEMBER(ss50_interface_port_device::write) { if (m_card == nullptr) { @@ -162,7 +162,7 @@ void ss50_interface_port_device::write(offs_t offset, u8 data) return; } - m_card->register_write(offset, data); + m_card->register_write(space, offset, data); } //------------------------------------------------- |