diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-01 11:20:04 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-18 15:27:51 -0400 |
| commit | fb0802113b4c57819cba15d64baf79bf4148607e (patch) | |
| tree | f040ef9bac4f3a13d4bf9191aa28503a93cd7709 /hw/kdrive | |
| parent | 410bc047480a9f98df678dc850bc6b99c3cfb5bf (diff) | |
Remove readmask from screen block/wakeup handler
With no users of the interface needing the readmask anymore, we can
remove it from the argument passed to these functions.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/kdrive')
| -rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 4 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.h | 6 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index d7948e8de..4eec72af9 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -347,14 +347,14 @@ ephyrEventWorkProc(ClientPtr client, void *closure) } static void -ephyrScreenBlockHandler(ScreenPtr pScreen, void *timeout, void *pRead) +ephyrScreenBlockHandler(ScreenPtr pScreen, void *timeout) { KdScreenPriv(pScreen); KdScreenInfo *screen = pScreenPriv->screen; EphyrScrPriv *scrpriv = screen->driver; pScreen->BlockHandler = scrpriv->BlockHandler; - (*pScreen->BlockHandler)(pScreen, timeout, pRead); + (*pScreen->BlockHandler)(pScreen, timeout); scrpriv->BlockHandler = pScreen->BlockHandler; pScreen->BlockHandler = ephyrScreenBlockHandler; diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index e1d2b5927..3c7f2cdf2 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -527,12 +527,10 @@ void KdScreenToPointerCoords(int *x, int *y); void - -KdBlockHandler(ScreenPtr pScreen, void *timeout, void *readmask); +KdBlockHandler(ScreenPtr pScreen, void *timeout); void - -KdWakeupHandler(ScreenPtr pScreen, unsigned long result, void *readmask); +KdWakeupHandler(ScreenPtr pScreen, int result); void KdDisableInput(void); diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 6ee575cf7..2c396246c 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1961,7 +1961,7 @@ _KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z, } void -KdBlockHandler(ScreenPtr pScreen, void *timeo, void *readmask) +KdBlockHandler(ScreenPtr pScreen, void *timeo) { KdPointerInfo *pi; int myTimeout = 0; @@ -1987,7 +1987,7 @@ KdBlockHandler(ScreenPtr pScreen, void *timeo, void *readmask) } void -KdWakeupHandler(ScreenPtr pScreen, unsigned long lresult, void *readmask) +KdWakeupHandler(ScreenPtr pScreen, int result) { KdPointerInfo *pi; |