diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-06 11:35:41 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-06 11:35:41 +0100 |
commit | d5206ab29d86a28634afbcf44b50775e74146cb2 (patch) | |
tree | e8623021321516f129b669c04a296a5de11cd9cf | |
parent | 9d6d59f7a37f1290237721918583becb66516ec0 (diff) |
cg6: port to new compat api.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/cg6_driver.c | 52 | ||||
-rw-r--r-- | src/compat-api.h | 99 |
3 files changed, 125 insertions, 29 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 21a367c..8bafe87 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,4 +32,5 @@ suncg6_drv_la_SOURCES = \ cg6_cursor.c \ cg6_driver.c \ cg6.h \ - cg6_regs.h + cg6_regs.h \ + compat-api.h diff --git a/src/cg6_driver.c b/src/cg6_driver.c index c967bf6..bf57b1d 100644 --- a/src/cg6_driver.c +++ b/src/cg6_driver.c @@ -37,25 +37,26 @@ #include "xf86cmap.h" #include "cg6.h" +#include "compat-api.h" + static const OptionInfoRec * CG6AvailableOptions(int chipid, int busid); static void CG6Identify(int flags); static Bool CG6Probe(DriverPtr drv, int flags); static Bool CG6PreInit(ScrnInfoPtr pScrn, int flags); -static Bool CG6ScreenInit(int Index, ScreenPtr pScreen, int argc, - char **argv); -static Bool CG6EnterVT(int scrnIndex, int flags); -static void CG6LeaveVT(int scrnIndex, int flags); -static Bool CG6CloseScreen(int scrnIndex, ScreenPtr pScreen); +static Bool CG6ScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool CG6EnterVT(VT_FUNC_ARGS_DECL); +static void CG6LeaveVT(VT_FUNC_ARGS_DECL); +static Bool CG6CloseScreen(CLOSE_SCREEN_ARGS_DECL); static Bool CG6SaveScreen(ScreenPtr pScreen, int mode); /* Required if the driver supports mode switching */ -static Bool CG6SwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +static Bool CG6SwitchMode(SWITCH_MODE_ARGS_DECL); /* Required if the driver supports moving the viewport */ -static void CG6AdjustFrame(int scrnIndex, int x, int y, int flags); +static void CG6AdjustFrame(ADJUST_FRAME_ARGS_DECL); /* Optional functions */ -static void CG6FreeScreen(int scrnIndex, int flags); -static ModeStatus CG6ValidMode(int scrnIndex, DisplayModePtr mode, +static void CG6FreeScreen(FREE_SCREEN_ARGS_DECL); +static ModeStatus CG6ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags); void CG6Sync(ScrnInfoPtr pScrn); @@ -430,17 +431,12 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) /* This gets called at the start of each server generation */ static Bool -CG6ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +CG6ScreenInit(SCREEN_INIT_ARGS_DECL) { - ScrnInfoPtr pScrn; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); Cg6Ptr pCg6; int ret; - /* - * First get the ScrnInfoRec - */ - pScrn = xf86Screens[pScreen->myNum]; - pCg6 = GET_CG6_FROM_SCRN(pScrn); /* Map the CG6 memory */ @@ -556,7 +552,7 @@ CG6ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Usually mandatory */ static Bool -CG6SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +CG6SwitchMode(SWITCH_MODE_ARGS_DECL) { return TRUE; } @@ -568,7 +564,7 @@ CG6SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) */ /* Usually mandatory */ static void -CG6AdjustFrame(int scrnIndex, int x, int y, int flags) +CG6AdjustFrame(ADJUST_FRAME_ARGS_DECL) { /* we don't support virtual desktops */ return; @@ -581,9 +577,9 @@ CG6AdjustFrame(int scrnIndex, int x, int y, int flags) /* Mandatory */ static Bool -CG6EnterVT(int scrnIndex, int flags) +CG6EnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn); if (pCg6->HWCursor) { @@ -601,7 +597,7 @@ CG6EnterVT(int scrnIndex, int flags) /* Mandatory */ static void -CG6LeaveVT(int scrnIndex, int flags) +CG6LeaveVT(VT_FUNC_ARGS_DECL) { return; } @@ -614,9 +610,9 @@ CG6LeaveVT(int scrnIndex, int flags) /* Mandatory */ static Bool -CG6CloseScreen(int scrnIndex, ScreenPtr pScreen) +CG6CloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn); pScrn->vtSema = FALSE; @@ -629,8 +625,7 @@ CG6CloseScreen(int scrnIndex, ScreenPtr pScreen) xf86SbusHideOsHwCursor(pCg6->psdp); pScreen->CloseScreen = pCg6->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); - return FALSE; + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } @@ -638,9 +633,10 @@ CG6CloseScreen(int scrnIndex, ScreenPtr pScreen) /* Optional */ static void -CG6FreeScreen(int scrnIndex, int flags) +CG6FreeScreen(FREE_SCREEN_ARGS_DECL) { - CG6FreeRec(xf86Screens[scrnIndex]); + SCRN_INFO_PTR(arg); + CG6FreeRec(pScrn); } @@ -648,7 +644,7 @@ CG6FreeScreen(int scrnIndex, int flags) /* Optional */ static ModeStatus -CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) +CG6ValidMode(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 |