cg3: port to new server API

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

3 files changed, 124 insertions, 28 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 17af3e2..a4c88f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,4 +30,5 @@ suncg3_drv_ladir = @moduledir@/drivers
 
 suncg3_drv_la_SOURCES = \
          cg3_driver.c \
-         cg3.h
+         cg3.h \
+         compat-api.h
diff --git a/src/cg3_driver.c b/src/cg3_driver.c
index 32f5e9c..80fd9e5 100644
--- a/src/cg3_driver.c
+++ b/src/cg3_driver.c
@@ -36,25 +36,26 @@
 #include "xf86cmap.h"
 #include "cg3.h"
 
+#include "compat-api.h"
+
 static const OptionInfoRec * CG3AvailableOptions(int chipid, int busid);
 static void	CG3Identify(int flags);
 static Bool	CG3Probe(DriverPtr drv, int flags);
 static Bool	CG3PreInit(ScrnInfoPtr pScrn, int flags);
-static Bool	CG3ScreenInit(int Index, ScreenPtr pScreen, int argc,
-			      char **argv);
-static Bool	CG3EnterVT(int scrnIndex, int flags);
-static void	CG3LeaveVT(int scrnIndex, int flags);
-static Bool	CG3CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool	CG3ScreenInit(SCREEN_INIT_ARGS_DECL);
+static Bool	CG3EnterVT(VT_FUNC_ARGS_DECL);
+static void	CG3LeaveVT(VT_FUNC_ARGS_DECL);
+static Bool	CG3CloseScreen(CLOSE_SCREEN_ARGS_DECL);
 static Bool	CG3SaveScreen(ScreenPtr pScreen, int mode);
 
 /* Required if the driver supports mode switching */
-static Bool	CG3SwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+static Bool	CG3SwitchMode(SWITCH_MODE_ARGS_DECL);
 /* Required if the driver supports moving the viewport */
-static void	CG3AdjustFrame(int scrnIndex, int x, int y, int flags);
+static void	CG3AdjustFrame(ADJUST_FRAME_ARGS_DECL);
 
 /* Optional functions */
-static void	CG3FreeScreen(int scrnIndex, int flags);
-static ModeStatus CG3ValidMode(int scrnIndex, DisplayModePtr mode,
+static void	CG3FreeScreen(FREE_SCREEN_ARGS_DECL);
+static ModeStatus CG3ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
 			       Bool verbose, int flags);
 
 void CG3Sync(ScrnInfoPtr pScrn);
@@ -389,17 +390,12 @@ CG3PreInit(ScrnInfoPtr pScrn, int flags)
 /* This gets called at the start of each server generation */
 
 static Bool
-CG3ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+CG3ScreenInit(SCREEN_INIT_ARGS_DECL)
 {
-    ScrnInfoPtr pScrn;
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     Cg3Ptr pCg3;
     int ret;
 
-    /* 
-     * First get the ScrnInfoRec
-     */
-    pScrn = xf86Screens[pScreen->myNum];
-
     pCg3 = GET_CG3_FROM_SCRN(pScrn);
 
     /* Map the CG3 memory */
@@ -488,7 +484,7 @@ CG3ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 
 /* Usually mandatory */
 static Bool
-CG3SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+CG3SwitchMode(SWITCH_MODE_ARGS_DECL)
 {
     return TRUE;
 }
@@ -500,7 +496,7 @@ CG3SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  */
 /* Usually mandatory */
 static void 
-CG3AdjustFrame(int scrnIndex, int x, int y, int flags)
+CG3AdjustFrame(ADJUST_FRAME_ARGS_DECL)
 {
     /* we don't support virtual desktops */
     return;
@@ -513,7 +509,7 @@ CG3AdjustFrame(int scrnIndex, int x, int y, int flags)
 
 /* Mandatory */
 static Bool
-CG3EnterVT(int scrnIndex, int flags)
+CG3EnterVT(VT_FUNC_ARGS_DECL)
 {
     return TRUE;
 }
@@ -525,7 +521,7 @@ CG3EnterVT(int scrnIndex, int flags)
 
 /* Mandatory */
 static void
-CG3LeaveVT(int scrnIndex, int flags)
+CG3LeaveVT(VT_FUNC_ARGS_DECL)
 {
     return;
 }
@@ -538,9 +534,9 @@ CG3LeaveVT(int scrnIndex, int flags)
 
 /* Mandatory */
 static Bool
-CG3CloseScreen(int scrnIndex, ScreenPtr pScreen)
+CG3CloseScreen(CLOSE_SCREEN_ARGS_DECL)
 {
-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     Cg3Ptr pCg3 = GET_CG3_FROM_SCRN(pScrn);
 
     pScrn->vtSema = FALSE;
@@ -548,8 +544,7 @@ CG3CloseScreen(int scrnIndex, ScreenPtr pScreen)
 		     (pCg3->psdp->width * pCg3->psdp->height));
     
     pScreen->CloseScreen = pCg3->CloseScreen;
-    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
-    return FALSE;
+    return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
 }
 
 
@@ -557,9 +552,10 @@ CG3CloseScreen(int scrnIndex, ScreenPtr pScreen)
 
 /* Optional */
 static void
-CG3FreeScreen(int scrnIndex, int flags)
+CG3FreeScreen(FREE_SCREEN_ARGS_DECL)
 {
-    CG3FreeRec(xf86Screens[scrnIndex]);
+    SCRN_INFO_PTR(arg);
+    CG3FreeRec(pScrn);
 }
 
 
@@ -567,7 +563,7 @@ CG3FreeScreen(int scrnIndex, int flags)
 
 /* Optional */
 static ModeStatus
-CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+CG3ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
 {
     if (mode->Flags & V_INTERLACE)
 	return(MODE_BAD);
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