summaryrefslogtreecommitdiff
path: root/hw/dmx
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-09-01 18:51:14 -0700
committerAdam Jackson <ajax@redhat.com>2016-07-18 15:27:51 -0400
commit9d15912aa475b733bbb20efc367a67dacad63bf1 (patch)
treebdbad787bf5be280df99636b37350158da233a8e /hw/dmx
parentfb0802113b4c57819cba15d64baf79bf4148607e (diff)
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 <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/dmx')
-rw-r--r--hw/dmx/dmxsync.c4
-rw-r--r--hw/dmx/input/dmxinputinit.c4
2 files changed, 4 insertions, 4 deletions
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;