diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/bus/spectrum/protek.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/bus/spectrum/protek.cpp')
-rw-r--r-- | src/devices/bus/spectrum/protek.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/devices/bus/spectrum/protek.cpp b/src/devices/bus/spectrum/protek.cpp index a3f3a1838f8..d1e122d8dbb 100644 --- a/src/devices/bus/spectrum/protek.cpp +++ b/src/devices/bus/spectrum/protek.cpp @@ -72,17 +72,20 @@ void spectrum_protek_device::device_start() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(spectrum_protek_device::port_fe_r) +uint8_t spectrum_protek_device::iorq_r(offs_t offset) { uint8_t data = 0xff; - uint8_t lines = offset >> 8; + switch (offset & 0xff) + { + case 0xfe: + if (((offset >> 8) & 8) == 0) + data = m_exp_line3->read() | (0xff ^ 0x10); - if ((lines & 8) == 0) - data = m_exp_line3->read() | (0xff ^ 0x10); - - if ((lines & 16) == 0) - data = m_exp_line4->read() | (0xff ^ 0x1d); + if (((offset >> 8) & 16) == 0) + data = m_exp_line4->read() | (0xff ^ 0x1d); + break; + } return data; } |