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/ym2151.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/sound/ym2151.cpp')
-rw-r--r-- | src/devices/sound/ym2151.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/sound/ym2151.cpp b/src/devices/sound/ym2151.cpp index 42c105c64a0..4f3a95acdb8 100644 --- a/src/devices/sound/ym2151.cpp +++ b/src/devices/sound/ym2151.cpp @@ -1676,7 +1676,7 @@ ym2151_device::ym2151_device(const machine_config &mconfig, const char *tag, dev // read - read from the device //------------------------------------------------- -u8 ym2151_device::read(offs_t offset) +READ8_MEMBER( ym2151_device::read ) { if (offset & 1) { @@ -1692,7 +1692,7 @@ u8 ym2151_device::read(offs_t offset) // write - write from the device //------------------------------------------------- -void ym2151_device::write(offs_t offset, u8 data) +WRITE8_MEMBER( ym2151_device::write ) { if (offset & 1) { @@ -1707,19 +1707,19 @@ void ym2151_device::write(offs_t offset, u8 data) } -u8 ym2151_device::status_r() +READ8_MEMBER( ym2151_device::status_r ) { - return read(1); + return read(space, 1); } -void ym2151_device::register_w(u8 data) +WRITE8_MEMBER( ym2151_device::register_w ) { - write(0, data); + write(space, 0, data); } -void ym2151_device::data_w(u8 data) +WRITE8_MEMBER( ym2151_device::data_w ) { - write(1, data); + write(space, 1, data); } |