summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/ym2148.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/machine/ym2148.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/ym2148.cpp')
-rw-r--r--src/devices/machine/ym2148.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/machine/ym2148.cpp b/src/devices/machine/ym2148.cpp
index 04a3e53e97e..10eb9c9e6c9 100644
--- a/src/devices/machine/ym2148.cpp
+++ b/src/devices/machine/ym2148.cpp
@@ -143,7 +143,7 @@ void ym2148_device::device_timer(emu_timer &timer, device_timer_id id, int param
}
-uint8_t ym2148_device::read(offs_t offset)
+READ8_MEMBER(ym2148_device::read)
{
switch (offset & 7)
{
@@ -165,7 +165,7 @@ uint8_t ym2148_device::read(offs_t offset)
}
-void ym2148_device::write(offs_t offset, uint8_t data)
+WRITE8_MEMBER(ym2148_device::write)
{
switch (offset & 7)
{