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/xfree86/common | |
| 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/xfree86/common')
| -rw-r--r-- | hw/xfree86/common/xf86VGAarbiter.c | 10 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86VGAarbiterPriv.h | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c index 5cc24298b..29a5f8512 100644 --- a/hw/xfree86/common/xf86VGAarbiter.c +++ b/hw/xfree86/common/xf86VGAarbiter.c @@ -265,23 +265,21 @@ VGAarbiterCloseScreen(ScreenPtr pScreen) } static void -VGAarbiterBlockHandler(ScreenPtr pScreen, - void *pTimeout, void *pReadmask) +VGAarbiterBlockHandler(ScreenPtr pScreen, void *pTimeout) { SCREEN_PROLOG(BlockHandler); VGAGet(pScreen); - pScreen->BlockHandler(pScreen, pTimeout, pReadmask); + pScreen->BlockHandler(pScreen, pTimeout); VGAPut(); SCREEN_EPILOG(BlockHandler, VGAarbiterBlockHandler); } static void -VGAarbiterWakeupHandler(ScreenPtr pScreen, unsigned long result, - void *pReadmask) +VGAarbiterWakeupHandler(ScreenPtr pScreen, int result) { SCREEN_PROLOG(WakeupHandler); VGAGet(pScreen); - pScreen->WakeupHandler(pScreen, result, pReadmask); + pScreen->WakeupHandler(pScreen, result); VGAPut(); SCREEN_EPILOG(WakeupHandler, VGAarbiterWakeupHandler); } diff --git a/hw/xfree86/common/xf86VGAarbiterPriv.h b/hw/xfree86/common/xf86VGAarbiterPriv.h index b832c9a5f..09be10aa3 100644 --- a/hw/xfree86/common/xf86VGAarbiterPriv.h +++ b/hw/xfree86/common/xf86VGAarbiterPriv.h @@ -146,10 +146,8 @@ typedef struct _VGAarbiterGC { } VGAarbiterGCRec, *VGAarbiterGCPtr; /* Screen funcs */ -static void VGAarbiterBlockHandler(ScreenPtr pScreen, void *pTimeout, - void *pReadmask); -static void VGAarbiterWakeupHandler(ScreenPtr pScreen, - unsigned long result, void *pReadmask); +static void VGAarbiterBlockHandler(ScreenPtr pScreen, void *pTimeout); +static void VGAarbiterWakeupHandler(ScreenPtr pScreen, int result); static Bool VGAarbiterCloseScreen(ScreenPtr pScreen); static void VGAarbiterGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, |