aboutsummaryrefslogtreecommitdiff
path: root/src/emuMB.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-05-31 17:52:43 -0700
committerPeter Hutterer <peter.hutterer@who-t.net>2016-09-06 13:51:21 +1000
commitbb8bde7456def4186f9a4a0a9f98d53c949e1450 (patch)
treed2a1c7bb8691368db6e70a2b2e741172330213f7 /src/emuMB.c
parentSupport XINPUT ABI version 23 (threaded input) (diff)
downloadxf86-input-evdev-bb8bde7456def4186f9a4a0a9f98d53c949e1450.tar.gz
xf86-input-evdev-bb8bde7456def4186f9a4a0a9f98d53c949e1450.tar.bz2
xf86-input-evdev-bb8bde7456def4186f9a4a0a9f98d53c949e1450.zip
Support XINPUT ABI 24 (remove select mask from block/wakeup handlers)
The evdev driver wasn't using the select mask arguments, so this change just involves adjusting the argument lists. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/emuMB.c')
-rw-r--r--src/emuMB.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/emuMB.c b/src/emuMB.c
index 94e50c4..d1777aa 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -268,9 +268,7 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press)
}
-void EvdevMBEmuWakeupHandler(pointer data,
- int i,
- pointer LastSelectMask)
+void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS)
{
InputInfoPtr pInfo = (InputInfoPtr)data;
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
@@ -284,9 +282,7 @@ void EvdevMBEmuWakeupHandler(pointer data,
}
}
-void EvdevMBEmuBlockHandler(pointer data,
- struct timeval **waitTime,
- pointer LastSelectMask)
+void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS)
{
InputInfoPtr pInfo = (InputInfoPtr) data;
EvdevPtr pEvdev= (EvdevPtr) pInfo->private;