x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch

66 +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
82 +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
83 +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
84 +#define CLOSE_SCREEN_DECL_ScrnInfoPtr ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
86 +#define FBDEVHWADJUSTFRAME_ARGS(x, y) scrnIndex, (x), (y), 0
93 +#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
96 +#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
98 +#define ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, b) pScrn->scrnIndex, b
100 +#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
150  imxDisplayStartScreenInit(int scrnIndex, ScreenPtr pScreen)
158 -		xf86DrvMsg(scrnIndex, X_ERROR, "mode initialization failed\n");
159 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mode initialization failed\n");
166 -		xf86DrvMsg(scrnIndex, X_ERROR, "mode initialization failed\n");
167 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mode initialization failed\n");
171 @@ -1463,29 +1465,29 @@ imxDisplayFinishScreenInit(int scrnIndex, ScreenPtr pScreen)
175 -imxDisplaySwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
178 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
185 -imxDisplayAdjustFrame(int scrnIndex, int x, int y, int flags)
188 -//	fbdevHWAdjustFrame(scrnIndex, x, y, flags);
189 +//	fbdevHWAdjustFrame(pScrn->scrnIndex, x, y, flags);
193 -imxDisplayEnterVT(int scrnIndex, int flags)
196 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
203 -imxDisplayLeaveVT(int scrnIndex, int flags)
212 @@ -59,16 +59,16 @@ imxDisplayValidMode(int scrnIndex, DisplayModePtr mode,
216 -imxDisplaySwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
220 -imxDisplayAdjustFrame(int scrnIndex, int x, int y, int flags);
224 -imxDisplayEnterVT(int scrnIndex, int flags);
228 -imxDisplayLeaveVT(int scrnIndex, int flags);
232  imxDisplayChangeFrameBufferRotateEPDC(int scrnIndex, int fbRotate);
250 -imxFreeScreen(int scrnIndex, int flags)
253 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
260 -imxCloseScreen(int scrnIndex, ScreenPtr pScreen)
263 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
268 @@ -453,7 +455,7 @@ imxCloseScreen(int scrnIndex, ScreenPtr pScreen)
272 -	return (*pScreen->CloseScreen)(scrnIndex, pScreen);
281 -imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
289 @@ -514,7 +516,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
293 -	        xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory"
294 +	        xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"mapping of video memory"
298 @@ -558,7 +560,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
302 -	xf86DrvMsg(scrnIndex, X_INFO,
303 +	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
307 @@ -568,12 +570,12 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
311 -		xf86DrvMsg(scrnIndex, X_INFO,
312 +		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
317 -	if (!imxDisplayStartScreenInit(scrnIndex, pScreen)) {
318 +	if (!imxDisplayStartScreenInit(pScrn->scrnIndex, pScreen)) {
322 @@ -582,7 +584,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
326 -			xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed"
327 +			xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed"
331 @@ -591,14 +593,14 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
335 -			xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed"
336 +			xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed"
343 -	  xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n");
344 +	  xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n");
348 @@ -607,10 +609,10 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
352 -	xf86DrvMsg(scrnIndex, X_INFO, "displayWidth = %d\n", pScrn->displayWidth);
353 +	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "displayWidth = %d\n", pScrn->displayWidth);
356 -		xf86DrvMsg(scrnIndex, X_INFO,
357 +		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
361 @@ -633,7 +635,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
365 -			xf86DrvMsg(scrnIndex, X_ERROR,
366 +			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
370 @@ -644,7 +646,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
374 -		xf86DrvMsg(scrnIndex, X_ERROR,
375 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
379 @@ -652,20 +654,20 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
383 -		xf86DrvMsg(scrnIndex, X_ERROR,
384 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
391 -		xf86DrvMsg(scrnIndex, X_ERROR,
392 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
398 -		xf86DrvMsg(scrnIndex, X_ERROR,
399 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
403 @@ -699,7 +701,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
407 -		if (!imxExaZ160Setup(scrnIndex, pScreen)) {
408 +		if (!imxExaZ160Setup(pScrn->scrnIndex, pScreen)) {
412 @@ -731,29 +733,29 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
416 -			xf86DrvMsg(scrnIndex, X_ERROR,
417 +			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
424 -		xf86DrvMsg(scrnIndex, X_ERROR,
425 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
430 -		xf86DrvMsg(scrnIndex, X_ERROR,
431 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
436 -		xf86DrvMsg(scrnIndex, X_ERROR,
437 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
442 -		xf86DrvMsg(scrnIndex, X_ERROR,
443 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
447 @@ -782,7 +784,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
451 -	if (!imxDisplayFinishScreenInit(scrnIndex, pScreen)) {
452 +	if (!imxDisplayFinishScreenInit(pScrn->scrnIndex, pScreen)) {
710 -imxExaZ160CloseScreen(int scrnIndex, ScreenPtr pScreen)
713 -	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
718 @@ -2504,7 +2505,7 @@ imxExaZ160CloseScreen(int scrnIndex, ScreenPtr pScreen)
722 -		return (*pScreen->CloseScreen)(scrnIndex, pScreen);
728  imxExaZ160Setup(int scrnIndex, ScreenPtr pScreen)
736 @@ -2582,7 +2583,7 @@ imxExaZ160Setup(int scrnIndex, ScreenPtr pScreen)
738  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
740 -		imxExaZ160CloseScreen(scrnIndex, pScreen);
745 @@ -2592,7 +2593,7 @@ imxExaZ160Setup(int scrnIndex, ScreenPtr pScreen)
747  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
749 -		imxExaZ160CloseScreen(scrnIndex, pScreen);
754 @@ -2657,7 +2658,7 @@ imxExaZ160Setup(int scrnIndex, ScreenPtr pScreen)
757  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "EXA initialization failed.\n");
758 -		imxExaZ160CloseScreen(scrnIndex, pScreen);
780 -	ScreenPtr           pScreen    = screenInfo.screens[pScreenInfo->scrnIndex];