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/3526intf.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/sound/3526intf.cpp')
-rw-r--r-- | src/devices/sound/3526intf.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp index 2418b9e65a1..86ee4a5c0b7 100644 --- a/src/devices/sound/3526intf.cpp +++ b/src/devices/sound/3526intf.cpp @@ -130,20 +130,20 @@ void ym3526_device::device_reset() } -u8 ym3526_device::read(offs_t offset) +READ8_MEMBER( ym3526_device::read ) { return ym3526_read(m_chip, offset & 1); } -void ym3526_device::write(offs_t offset, u8 data) +WRITE8_MEMBER( ym3526_device::write ) { ym3526_write(m_chip, offset & 1, data); } -u8 ym3526_device::status_port_r() { return read(0); } -u8 ym3526_device::read_port_r() { return read(1); } -void ym3526_device::control_port_w(u8 data) { write(0, data); } -void ym3526_device::write_port_w(u8 data) { write(1, data); } +READ8_MEMBER( ym3526_device::status_port_r ) { return read(space, 0); } +READ8_MEMBER( ym3526_device::read_port_r ) { return read(space, 1); } +WRITE8_MEMBER( ym3526_device::control_port_w ) { write(space, 0, data); } +WRITE8_MEMBER( ym3526_device::write_port_w ) { write(space, 1, data); } DEFINE_DEVICE_TYPE(YM3526, ym3526_device, "ym3526", "YM3526 OPL") |