summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/spectrum/usource.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/spectrum/usource.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/spectrum/usource.cpp')
-rw-r--r--src/devices/bus/spectrum/usource.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/devices/bus/spectrum/usource.cpp b/src/devices/bus/spectrum/usource.cpp
index 13f302b14c5..b4fb9c5797a 100644
--- a/src/devices/bus/spectrum/usource.cpp
+++ b/src/devices/bus/spectrum/usource.cpp
@@ -60,7 +60,6 @@ spectrum_usource_device::spectrum_usource_device(const machine_config &mconfig,
void spectrum_usource_device::device_start()
{
- save_item(NAME(m_romcs));
}
@@ -83,15 +82,17 @@ READ_LINE_MEMBER(spectrum_usource_device::romcs)
return m_romcs;
}
-void spectrum_usource_device::opcode_fetch(offs_t offset)
+
+READ8_MEMBER(spectrum_usource_device::mreq_r)
{
+ uint8_t data;
+
if (!machine().side_effects_disabled() && (offset == 0x2bae))
{
m_romcs = !m_romcs;
}
-}
-uint8_t spectrum_usource_device::mreq_r(offs_t offset)
-{
- return m_rom->base()[offset & 0x1fff];
+ data = m_rom->base()[offset & 0x1fff];
+
+ return data;
}