diff options
Diffstat (limited to 'src/smi_video.c')
| -rw-r--r-- | src/smi_video.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/smi_video.c b/src/smi_video.c index b4511b8..9d8b35f 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -123,8 +123,7 @@ static void SMI_DisplayVideo0501(ScrnInfoPtr pScrn, int id, int offset, static void SMI_DisplayVideo0730(ScrnInfoPtr pScrn, int id, int offset, short width, short height, int pitch, int x1, int y1, int x2, int y2, BoxPtr dstBox, short vid_w, short vid_h, short drw_w, short drw_h); -static void SMI_BlockHandler(int i, pointer blockData, pointer pTimeout, - pointer pReadMask); +static void SMI_BlockHandler(BLOCKHANDLER_ARGS_DECL); /*static int SMI_SendI2C(ScrnInfoPtr pScrn, CARD8 device, char *devName, SMI_I2CDataPtr i2cData);*/ @@ -2060,20 +2059,15 @@ SMI_DisplayVideo0730( } static void -SMI_BlockHandler( - int i, - pointer blockData, - pointer pTimeout, - pointer pReadMask -) +SMI_BlockHandler(BLOCKHANDLER_ARGS_DECL) { - ScreenPtr pScreen = screenInfo.screens[i]; - ScrnInfoPtr pScrn = xf86Screens[i]; + SCREEN_PTR(arg); + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); SMI_PortPtr pPort = (SMI_PortPtr) pSmi->ptrAdaptor->pPortPrivates[0].ptr; pScreen->BlockHandler = pSmi->BlockHandler; - (*pScreen->BlockHandler)(i, blockData, pTimeout, pReadMask); + (*pScreen->BlockHandler)(BLOCKHANDLER_ARGS); pScreen->BlockHandler = SMI_BlockHandler; if (pPort->videoStatus & TIMER_MASK) { |