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/machine/mc6852.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/mc6852.cpp')
-rw-r--r-- | src/devices/machine/mc6852.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/devices/machine/mc6852.cpp b/src/devices/machine/mc6852.cpp index 6d5a9876153..d2021a450a2 100644 --- a/src/devices/machine/mc6852.cpp +++ b/src/devices/machine/mc6852.cpp @@ -147,7 +147,7 @@ void mc6852_device::rcv_complete() // read - //------------------------------------------------- -uint8_t mc6852_device::read(offs_t offset) +READ8_MEMBER( mc6852_device::read ) { uint8_t data = 0; @@ -156,8 +156,7 @@ uint8_t mc6852_device::read(offs_t offset) if (m_rx_fifo.size() > 0) { data = m_rx_fifo.front(); - if (!machine().side_effects_disabled()) - m_rx_fifo.pop(); + m_rx_fifo.pop(); } } else @@ -173,7 +172,7 @@ uint8_t mc6852_device::read(offs_t offset) // write - //------------------------------------------------- -void mc6852_device::write(offs_t offset, uint8_t data) +WRITE8_MEMBER( mc6852_device::write ) { if (BIT(offset, 0)) { |