i740: bump to new X server compat API.

Signed-off-by: Dave Airlie <airlied@redhat.com>

6 files changed, 141 insertions, 43 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 6f084aa..0e447b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,7 @@ i740_drv_la_LDFLAGS = -module -avoid-version
 i740_drv_ladir = @moduledir@/drivers
 
 i740_drv_la_SOURCES = \
+         compat-api.h \
          i740_accel.c \
          i740_cursor.c \
          i740_dga.c \
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..6bc946f
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Dave Airlie <airlied@redhat.com>
+ */
+
+/* this file provides API compat between server post 1.13 and pre it,
+   it should be reused inside as many drivers as possible */
+#ifndef COMPAT_API_H
+#define COMPAT_API_H
+
+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
+#endif
+
+#ifndef XF86_HAS_SCRN_CONV
+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
+#endif
+
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
+
+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS pScrn
+
+#define XF86_SCRN_ARG(x) (x)
+
+#endif
+
+#endif
diff --git a/src/i740.h b/src/i740.h
index 4e4dd9c..3723e57 100644
--- a/src/i740.h
+++ b/src/i740.h
@@ -48,6 +48,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 #include "xf86Cursor.h"
 
+#include "compat-api.h"
 /* Globals */
 /* Memory mapped register access macros */
 #define INREG8(addr)        *(volatile CARD8  *)(pI740->MMIOBase + (addr))
@@ -155,8 +156,8 @@ void I740SetPIOAccess(I740Ptr pI740);
 void I740SetMMIOAccess(I740Ptr pI740);
 void I740InitVideo(ScreenPtr pScreen);
 
-Bool I740SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
-void I740AdjustFrame(int scrnIndex, int x, int y, int flags);
+Bool I740SwitchMode(SWITCH_MODE_ARGS_DECL);
+void I740AdjustFrame(ADJUST_FRAME_ARGS_DECL);
 
 Bool I740_I2CInit(ScrnInfoPtr pScrn);
 
diff --git a/src/i740_dga.c b/src/i740_dga.c
index 9315080..a81c16f 100644
--- a/src/i740_dga.c
+++ b/src/i740_dga.c
@@ -153,8 +153,8 @@ static Bool I740_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode)
   if(!pMode) { /* restore the original mode */
     if(pI740->DGAactive) {
       pScrn->currentMode = I740SavedDGAModes[index];
-      I740SwitchMode(index, pScrn->currentMode, 0);
-      I740AdjustFrame(index, 0, 0, 0);
+      I740SwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode));
+      I740AdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0));
       pI740->DGAactive = FALSE;
     }
   } else {
@@ -163,7 +163,7 @@ static Bool I740_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode)
       pI740->DGAactive = TRUE;
     }
 
-    I740SwitchMode(index, pMode->mode, 0);
+    I740SwitchMode(SWITCH_MODE_ARGS(pScrn, pMode->mode));
   }
    
   return TRUE;
@@ -181,7 +181,7 @@ static void I740_SetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
   I740Ptr pI740 = I740PTR(pScrn);
   vgaHWPtr hwp = VGAHWPTR(pScrn);
 
-  I740AdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+  I740AdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y));
 
   /* wait for retrace */
   while((hwp->readST01(hwp) & 0x08));
diff --git a/src/i740_driver.c b/src/i740_driver.c
index fc26f0e..1c82198 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -107,25 +107,25 @@ static Bool I740Probe(DriverPtr drv, int flags);
 static Bool I740PreInit(ScrnInfoPtr pScrn, int flags);
 
 /* Initialize a screen */
-static Bool I740ScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv);
+static Bool I740ScreenInit(SCREEN_INIT_ARGS_DECL);
 
 /* Enter from a virtual terminal */
-static Bool I740EnterVT(int scrnIndex, int flags);
+static Bool I740EnterVT(VT_FUNC_ARGS_DECL);
 
 /* Leave to a virtual terminal */
-static void I740LeaveVT(int scrnIndex, int flags);
+static void I740LeaveVT(VT_FUNC_ARGS_DECL);
 
 /* Close down each screen we initialized */
-static Bool I740CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool I740CloseScreen(CLOSE_SCREEN_ARGS_DECL);
 
 /* Change screensaver state */
 static Bool I740SaveScreen(ScreenPtr pScreen, int mode);
 
 /* Cleanup server private data */
-static void I740FreeScreen(int scrnIndex, int flags);
+static void I740FreeScreen(FREE_SCREEN_ARGS_DECL);
 
 /* Check if a mode is valid on the hardware */
-static ModeStatus I740ValidMode(int scrnIndex, DisplayModePtr mode,
+static ModeStatus I740ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
 				Bool verbose, int flags);
 
 /* Switch to various Display Power Management System levels */
@@ -675,7 +675,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
 	   if (I740_I2CInit(pScrn))
 	     {
 	       xf86MonPtr MonInfo;
-	       if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c))) {
+	       if ((MonInfo = xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn),pI740->rc_i2c))) {
 		 xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
 			    MonInfo);
 		 xf86PrintEDID( MonInfo );
@@ -1471,13 +1471,13 @@ I740LoadPalette24(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
 }
 
 static Bool
-I740ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
+I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
   ScrnInfoPtr pScrn;
   vgaHWPtr hwp;
   I740Ptr pI740;
   VisualPtr visual;
 
-  pScrn = xf86Screens[pScreen->myNum];
+  pScrn = xf86ScreenToScrn(pScreen);
   pI740 = I740PTR(pScrn);
   hwp = VGAHWPTR(pScrn);
 
@@ -1494,7 +1494,7 @@ I740ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
   if (!I740ModeInit(pScrn, pScrn->currentMode)) return FALSE;
 
   I740SaveScreen(pScreen, SCREEN_SAVER_ON);
-  I740AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+  I740AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
 
   miClearVisualTypes();
 
@@ -1515,7 +1515,7 @@ I740ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
       return FALSE;
     break;
   default:
-    xf86DrvMsg(scrnIndex, X_ERROR,
+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 	       "Internal error: invalid bpp (%d) in I740ScrnInit\n",
 	       pScrn->bitsPerPixel);
     return FALSE;
@@ -1608,20 +1608,17 @@ I740ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
 }
 
 Bool
-I740SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) {
-  ScrnInfoPtr pScrn;
-
-  pScrn=xf86Screens[scrnIndex];
+I740SwitchMode(SWITCH_MODE_ARGS_DECL) {
+  SCRN_INFO_PTR(arg);
   return I740ModeInit(pScrn, mode);
 }
 
 void
-I740AdjustFrame(int scrnIndex, int x, int y, int flags) {
-  ScrnInfoPtr pScrn;
+I740AdjustFrame(ADJUST_FRAME_ARGS_DECL) {
+  SCRN_INFO_PTR(arg);
   int Base;
   vgaHWPtr hwp;
 
-  pScrn = xf86Screens[scrnIndex];
   hwp = VGAHWPTR(pScrn);
 
   Base = (y * pScrn->displayWidth + x) >> 2;
@@ -1652,34 +1649,32 @@ I740AdjustFrame(int scrnIndex, int x, int y, int flags) {
 }
 
 static Bool
-I740EnterVT(int scrnIndex, int flags) {
-  ScrnInfoPtr pScrn;
+I740EnterVT(VT_FUNC_ARGS_DECL) {
+  SCRN_INFO_PTR(arg);
 
-  pScrn = xf86Screens[scrnIndex];
   if (!I740ModeInit(pScrn, pScrn->currentMode)) return FALSE;
-  I740AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+  I740AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
   return TRUE;
 }
 
 static void
-I740LeaveVT(int scrnIndex, int flags) {
-  ScrnInfoPtr pScrn;
+I740LeaveVT(VT_FUNC_ARGS_DECL) {
+  SCRN_INFO_PTR(arg);
   vgaHWPtr hwp;
 
-  pScrn = xf86Screens[scrnIndex];
   hwp=VGAHWPTR(pScrn);
   I740Restore(pScrn);
   vgaHWLock(hwp);
 }
 
 static Bool
-I740CloseScreen(int scrnIndex, ScreenPtr pScreen)
+I740CloseScreen(CLOSE_SCREEN_ARGS_DECL)
 {
   ScrnInfoPtr pScrn;
   vgaHWPtr hwp;
   I740Ptr pI740;
 
-  pScrn = xf86Screens[scrnIndex];
+  pScrn = xf86ScreenToScrn(pScreen);
   hwp = VGAHWPTR(pScrn);
   pI740 = I740PTR(pScrn);
 
@@ -1701,21 +1696,23 @@ I740CloseScreen(int scrnIndex, ScreenPtr pScreen)
   pScrn->vtSema=FALSE;
 
   pScreen->CloseScreen = pI740->CloseScreen;
-  return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+  return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
 }
 
 static void
-I740FreeScreen(int scrnIndex, int flags) {
-  I740FreeRec(xf86Screens[scrnIndex]);
+I740FreeScreen(FREE_SCREEN_ARGS_DECL) {
+  SCRN_INFO_PTR(arg);
+  I740FreeRec(pScrn);
   if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
-    vgaHWFreeHWRec(xf86Screens[scrnIndex]);
+    vgaHWFreeHWRec(pScrn);
 }
 
 static ModeStatus
-I740ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) {
+I740ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) {
+  SCRN_INFO_PTR(arg);
   if (mode->Flags & V_INTERLACE) {
     if (verbose) {
-      xf86DrvMsg(scrnIndex, X_PROBED, 
+      xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
 		 "Removing interlaced mode \"%s\"\n",
 		 mode->name);
     }
diff --git a/src/i740_video.c b/src/i740_video.c
index 2f783c2..00c69af 100644
--- a/src/i740_video.c
+++ b/src/i740_video.c
@@ -828,10 +828,10 @@ static int I740QueryImageAttributes(ScrnInfoPtr pScrn, int id, unsigned short *w
   return size;
 }
 
-static void I740BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+static void I740BlockHandler(BLOCKHANDLER_ARGS_DECL)
 {
-  ScreenPtr   pScreen = screenInfo.screens[i];
-  ScrnInfoPtr pScrn = xf86Screens[i];
+  SCREEN_PTR(arg);
+  ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
   I740Ptr      pI740 = I740PTR(pScrn);
   I740PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
 
@@ -839,7 +839,7 @@ static void I740BlockHandler(int i, pointer blockData, pointer pTimeout, pointer
 
   pScreen->BlockHandler = pI740->BlockHandler;
     
-  (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+  (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
 
   pScreen->BlockHandler = I740BlockHandler;