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/sound/rf5c68.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/sound/rf5c68.cpp')
-rw-r--r-- | src/devices/sound/rf5c68.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/sound/rf5c68.cpp b/src/devices/sound/rf5c68.cpp index 9ec522b7d92..2af393c884b 100644 --- a/src/devices/sound/rf5c68.cpp +++ b/src/devices/sound/rf5c68.cpp @@ -189,7 +189,7 @@ void rf5c68_device::sound_stream_update(sound_stream &stream, stream_sample_t ** // RF5C68 write register //------------------------------------------------- -u8 rf5c68_device::rf5c68_r(offs_t offset) +READ8_MEMBER( rf5c68_device::rf5c68_r ) { uint8_t shift; @@ -201,7 +201,7 @@ u8 rf5c68_device::rf5c68_r(offs_t offset) return (m_chan[(offset & 0x0e) >> 1].addr) >> (shift); } -void rf5c68_device::rf5c68_w(offs_t offset, u8 data) +WRITE8_MEMBER( rf5c68_device::rf5c68_w ) { pcm_channel &chan = m_chan[m_cbank]; int i; @@ -266,7 +266,7 @@ void rf5c68_device::rf5c68_w(offs_t offset, u8 data) // RF5C68 read memory //------------------------------------------------- -u8 rf5c68_device::rf5c68_mem_r(offs_t offset) +READ8_MEMBER( rf5c68_device::rf5c68_mem_r ) { return m_cache->read_byte(m_wbank | offset); } @@ -276,7 +276,7 @@ u8 rf5c68_device::rf5c68_mem_r(offs_t offset) // RF5C68 write memory //------------------------------------------------- -void rf5c68_device::rf5c68_mem_w(offs_t offset, u8 data) +WRITE8_MEMBER( rf5c68_device::rf5c68_mem_w ) { m_data->write_byte(m_wbank | offset, data); } |