summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/kdrive/ephyr/ephyr.c4
-rw-r--r--hw/kdrive/src/kdrive.h6
-rw-r--r--hw/kdrive/src/kinput.c4
-rw-r--r--hw/xfree86/common/xf86VGAarbiter.c10
-rw-r--r--hw/xfree86/common/xf86VGAarbiterPriv.h6
-rw-r--r--hw/xfree86/dri/dri.c12
-rw-r--r--hw/xfree86/dri/dri.h7
-rw-r--r--hw/xfree86/drivers/modesetting/driver.c8
-rw-r--r--hw/xfree86/modes/xf86Rotate.c5
-rw-r--r--hw/xquartz/quartzCocoa.m8
-rw-r--r--hw/xquartz/quartzCommon.h5
-rw-r--r--hw/xwin/win.h4
-rw-r--r--hw/xwin/winwakeup.c3
13 files changed, 31 insertions, 51 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;
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,
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index dbad12fee..d39924646 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1676,8 +1676,7 @@ DRIWakeupHandler(void *wakeupData, int result, void *pReadmask)
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
if (pDRIPriv && pDRIPriv->pDriverInfo->wrap.WakeupHandler)
- (*pDRIPriv->pDriverInfo->wrap.WakeupHandler) (pScreen,
- result, pReadmask);
+ (*pDRIPriv->pDriverInfo->wrap.WakeupHandler) (pScreen, result);
}
}
@@ -1691,14 +1690,12 @@ DRIBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadmask)
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
if (pDRIPriv && pDRIPriv->pDriverInfo->wrap.BlockHandler)
- (*pDRIPriv->pDriverInfo->wrap.BlockHandler) (pScreen,
- pTimeout, pReadmask);
+ (*pDRIPriv->pDriverInfo->wrap.BlockHandler) (pScreen, pTimeout);
}
}
void
-DRIDoWakeupHandler(ScreenPtr pScreen,
- unsigned long result, void *pReadmask)
+DRIDoWakeupHandler(ScreenPtr pScreen, int result)
{
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1715,8 +1712,7 @@ DRIDoWakeupHandler(ScreenPtr pScreen,
}
void
-DRIDoBlockHandler(ScreenPtr pScreen,
- void *pTimeout, void *pReadmask)
+DRIDoBlockHandler(ScreenPtr pScreen, void *timeout)
{
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h
index 7e0337fce..c659a207f 100644
--- a/hw/xfree86/dri/dri.h
+++ b/hw/xfree86/dri/dri.h
@@ -269,12 +269,9 @@ extern _X_EXPORT void DRIWakeupHandler(void *wakeupData,
extern _X_EXPORT void DRIBlockHandler(void *blockData,
OSTimePtr pTimeout, void *pReadmask);
-extern _X_EXPORT void DRIDoWakeupHandler(ScreenPtr pScreen,
- unsigned long result,
- void *pReadmask);
+extern _X_EXPORT void DRIDoWakeupHandler(ScreenPtr pScreen, int result);
-extern _X_EXPORT void DRIDoBlockHandler(ScreenPtr pScreen,
- void *pTimeout, void *pReadmask);
+extern _X_EXPORT void DRIDoBlockHandler(ScreenPtr pScreen, void *timeout);
extern _X_EXPORT void DRISwapContext(int drmFD, void *oldctx, void *newctx);
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 262a8992c..f2620821b 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -639,12 +639,12 @@ ms_dirty_get_ent(ScreenPtr screen, PixmapPtr slave_dst)
}
static void
-msBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask)
+msBlockHandler(ScreenPtr pScreen, void *timeout)
{
modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
pScreen->BlockHandler = ms->BlockHandler;
- pScreen->BlockHandler(pScreen, pTimeout, pReadmask);
+ pScreen->BlockHandler(pScreen, timeout);
ms->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = msBlockHandler;
if (pScreen->isGPU && !ms->drmmode.reverse_prime_offload_mode)
@@ -656,12 +656,12 @@ msBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask)
}
static void
-msBlockHandler_oneshot(ScreenPtr pScreen, void *pTimeout, void *pReadmask)
+msBlockHandler_oneshot(ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(pScrn);
- msBlockHandler(pScreen, pTimeout, pReadmask);
+ msBlockHandler(pScreen, pTimeout);
drmmode_set_desired_modes(pScrn, &ms->drmmode, TRUE);
}
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index fbd3c3204..13e5a5059 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -221,8 +221,7 @@ xf86RotateRedisplay(ScreenPtr pScreen)
}
static void
-xf86RotateBlockHandler(ScreenPtr pScreen,
- void *pTimeout, void *pReadmask)
+xf86RotateBlockHandler(ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
@@ -235,7 +234,7 @@ xf86RotateBlockHandler(ScreenPtr pScreen,
xf86RotateRedisplay(pScreen);
- (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
+ (*pScreen->BlockHandler) (pScreen, pTimeout);
/* Re-wrap if we still need this hook */
if (xf86_config->rotation_damage != NULL) {
diff --git a/hw/xquartz/quartzCocoa.m b/hw/xquartz/quartzCocoa.m
index d21fb7d91..ac6f67e2b 100644
--- a/hw/xquartz/quartzCocoa.m
+++ b/hw/xquartz/quartzCocoa.m
@@ -48,9 +48,7 @@
* Clean out any autoreleased objects.
*/
void
-QuartzBlockHandler(void *blockData,
- OSTimePtr pTimeout,
- void *pReadmask)
+QuartzBlockHandler(void *blockData, void *pTimeout)
{
static NSAutoreleasePool *aPool = nil;
@@ -62,9 +60,7 @@ QuartzBlockHandler(void *blockData,
* QuartzWakeupHandler
*/
void
-QuartzWakeupHandler(void *blockData,
- int result,
- void *pReadmask)
+QuartzWakeupHandler(void *blockData, int result)
{
// nothing here
}
diff --git a/hw/xquartz/quartzCommon.h b/hw/xquartz/quartzCommon.h
index 308a3f173..721886b87 100644
--- a/hw/xquartz/quartzCommon.h
+++ b/hw/xquartz/quartzCommon.h
@@ -47,8 +47,9 @@ extern int aquaMenuBarHeight;
extern const char *quartzOpenGLBundle;
void
-QuartzBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadmask);
+QuartzBlockHandler(void *blockData, void *pTimeout);
+
void
-QuartzWakeupHandler(void *blockData, int result, void *pReadmask);
+QuartzWakeupHandler(void *blockData, int result);
#endif /* _QUARTZCOMMON_H */
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 787c42a96..9fa697dcc 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -902,9 +902,7 @@ Bool
*/
void
-
-winWakeupHandler(ScreenPtr pScreen,
- unsigned long ulResult, void *pReadmask);
+winWakeupHandler(ScreenPtr pScreen, int iResult);
/*
* winwindow.c
diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c
index ebcb0fad9..f593886ff 100644
--- a/hw/xwin/winwakeup.c
+++ b/hw/xwin/winwakeup.c
@@ -38,8 +38,7 @@
/* See Porting Layer Definition - p. 7 */
void
-winWakeupHandler(ScreenPtr pScreen,
- unsigned long ulResult, void *pReadmask)
+winWakeupHandler(ScreenPtr pScreen, int iResult)
{
MSG msg;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 22:52:00 +0000