From 9d15912aa475b733bbb20efc367a67dacad63bf1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 1 Sep 2015 18:51:14 -0700 Subject: Remove fd_set from Block/Wakeup handler API This removes the last uses of fd_set from the server interfaces outside of the OS layer itself. Signed-off-by: Keith Packard Reviewed-by: Adam Jackson --- hw/dmx/dmxsync.c | 4 ++-- hw/dmx/input/dmxinputinit.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'hw/dmx') diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c index 81dbbc64d..1bc242343 100644 --- a/hw/dmx/dmxsync.c +++ b/hw/dmx/dmxsync.c @@ -99,13 +99,13 @@ dmxSyncCallback(OsTimerPtr timer, CARD32 time, void *arg) } static void -dmxSyncBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadMask) +dmxSyncBlockHandler(void *blockData, void *timeout) { TimerForce(dmxSyncTimer); } static void -dmxSyncWakeupHandler(void *blockData, int result, void *pReadMask) +dmxSyncWakeupHandler(void *blockData, int result) { } diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index a9522ff08..554d234e9 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -630,7 +630,7 @@ dmxCollectAll(DMXInputInfo * dmxInput) } static void -dmxBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadMask) +dmxBlockHandler(void *blockData, void *timeout) { DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t) blockData]; static unsigned long generation = 0; @@ -658,7 +658,7 @@ dmxSwitchReturn(void *p) } static void -dmxWakeupHandler(void *blockData, int result, void *pReadMask) +dmxWakeupHandler(void *blockData, int result) { DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t) blockData]; int i; -- cgit v1.2.3