summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/bbc/userport/pointer.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/bus/bbc/userport/pointer.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/bbc/userport/pointer.cpp')
-rw-r--r--src/devices/bus/bbc/userport/pointer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/bus/bbc/userport/pointer.cpp b/src/devices/bus/bbc/userport/pointer.cpp
index d8272766d98..9a222388989 100644
--- a/src/devices/bus/bbc/userport/pointer.cpp
+++ b/src/devices/bus/bbc/userport/pointer.cpp
@@ -261,17 +261,17 @@ TIMER_CALLBACK_MEMBER(bbc_pointer_device::pointer_poll)
}
}
-uint8_t bbc_amxmouse_device::pb_r()
+READ8_MEMBER(bbc_amxmouse_device::pb_r)
{
return (m_buttons->read() & 0xe0) | (m_xdir << 0) | (m_ydir << 2) | 0x1a;
}
-uint8_t bbc_m512mouse_device::pb_r()
+READ8_MEMBER(bbc_m512mouse_device::pb_r)
{
return (m_buttons->read() & 0x07) | (m_xdir << 3) | (m_ydir << 4) | 0xe0;
}
-uint8_t bbc_tracker_device::pb_r()
+READ8_MEMBER(bbc_tracker_device::pb_r)
{
return (m_buttons->read() & 0x07) | (m_xdir << 3) | (m_ydir << 4) | 0xe0;
}