diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-07 18:55:10 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-07 18:55:10 +0100 |
commit | b2ff02eb88241583bad4b76d2369a388beade927 (patch) | |
tree | 62732e7012370303e5c374431a0c1e69b9a2bf0d | |
parent | 431e56e06b456ad9bd95dc2b5416708625d91b0a (diff) |
suntcx: port to new compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/compat-api.h | 99 | ||||
-rw-r--r-- | src/tcx.h | 1 | ||||
-rw-r--r-- | src/tcx_cursor.c | 2 | ||||
-rw-r--r-- | src/tcx_driver.c | 44 |
5 files changed, 124 insertions, 23 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d8511e9..3e0d5a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,7 @@ suntcx_drv_la_LDFLAGS = -module -avoid-version suntcx_drv_ladir = @moduledir@/drivers suntcx_drv_la_SOURCES = \ + compat-api.h \ tcx_cursor.c \ tcx_driver.c \ tcx.h \ 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 @@ -32,6 +32,7 @@ #include "xf86sbusBus.h" #include "tcx_regs.h" +#include "compat-api.h" /* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */ #define TCX_RAM8_VOFF 0x00000000 #define TCX_RAM24_VOFF 0x01000000 diff --git a/src/tcx_cursor.c b/src/tcx_cursor.c index 376e9fd..411b6de 100644 --- a/src/tcx_cursor.c +++ b/src/tcx_cursor.c @@ -124,7 +124,7 @@ TCXSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) Bool TCXHWCursorInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); TcxPtr pTcx; xf86CursorInfoPtr infoPtr; diff --git a/src/tcx_driver.c b/src/tcx_driver.c index 83c71af..5503ab5 100644 --- a/src/tcx_driver.c +++ b/src/tcx_driver.c @@ -41,22 +41,21 @@ static const OptionInfoRec * TCXAvailableOptions(int chipid, int busid); static void TCXIdentify(int flags); static Bool TCXProbe(DriverPtr drv, int flags); static Bool TCXPreInit(ScrnInfoPtr pScrn, int flags); -static Bool TCXScreenInit(int Index, ScreenPtr pScreen, int argc, - char **argv); -static Bool TCXEnterVT(int scrnIndex, int flags); -static void TCXLeaveVT(int scrnIndex, int flags); -static Bool TCXCloseScreen(int scrnIndex, ScreenPtr pScreen); +static Bool TCXScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool TCXEnterVT(VT_FUNC_ARGS_DECL); +static void TCXLeaveVT(VT_FUNC_ARGS_DECL); +static Bool TCXCloseScreen(CLOSE_SCREEN_ARGS_DECL); static Bool TCXSaveScreen(ScreenPtr pScreen, int mode); static void TCXInitCplane24(ScrnInfoPtr pScrn); /* Required if the driver supports mode switching */ -static Bool TCXSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +static Bool TCXSwitchMode(SWITCH_MODE_ARGS_DECL); /* Required if the driver supports moving the viewport */ -static void TCXAdjustFrame(int scrnIndex, int x, int y, int flags); +static void TCXAdjustFrame(ADJUST_FRAME_ARGS_DECL); /* Optional functions */ -static void TCXFreeScreen(int scrnIndex, int flags); -static ModeStatus TCXValidMode(int scrnIndex, DisplayModePtr mode, +static void TCXFreeScreen(FREE_SCREEN_ARGS_DECL); +static ModeStatus TCXValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags); void TCXSync(ScrnInfoPtr pScrn); @@ -471,7 +470,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags) /* This gets called at the start of each server generation */ static Bool -TCXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +TCXScreenInit(SCREEN_INIT_ARGS_DECL) { ScrnInfoPtr pScrn; TcxPtr pTcx; @@ -481,7 +480,7 @@ TCXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* * First get the ScrnInfoRec */ - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pTcx = GET_TCX_FROM_SCRN(pScrn); @@ -622,7 +621,7 @@ TCXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Usually mandatory */ static Bool -TCXSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +TCXSwitchMode(SWITCH_MODE_ARGS_DECL) { return TRUE; } @@ -634,7 +633,7 @@ TCXSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) */ /* Usually mandatory */ static void -TCXAdjustFrame(int scrnIndex, int x, int y, int flags) +TCXAdjustFrame(ADJUST_FRAME_ARGS_DECL) { /* we don't support virtual desktops */ return; @@ -647,9 +646,9 @@ TCXAdjustFrame(int scrnIndex, int x, int y, int flags) /* Mandatory */ static Bool -TCXEnterVT(int scrnIndex, int flags) +TCXEnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn); if (pTcx->HWCursor) { @@ -670,7 +669,7 @@ TCXEnterVT(int scrnIndex, int flags) /* Mandatory */ static void -TCXLeaveVT(int scrnIndex, int flags) +TCXLeaveVT(VT_FUNC_ARGS_DECL) { return; } @@ -683,9 +682,9 @@ TCXLeaveVT(int scrnIndex, int flags) /* Mandatory */ static Bool -TCXCloseScreen(int scrnIndex, ScreenPtr pScreen) +TCXCloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn); pScrn->vtSema = FALSE; @@ -705,7 +704,7 @@ TCXCloseScreen(int scrnIndex, ScreenPtr pScreen) xf86SbusHideOsHwCursor (pTcx->psdp); pScreen->CloseScreen = pTcx->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); return FALSE; } @@ -714,9 +713,10 @@ TCXCloseScreen(int scrnIndex, ScreenPtr pScreen) /* Optional */ static void -TCXFreeScreen(int scrnIndex, int flags) +TCXFreeScreen(FREE_SCREEN_ARGS_DECL) { - TCXFreeRec(xf86Screens[scrnIndex]); + SCRN_INFO_PTR(arg); + TCXFreeRec(pScrn); } @@ -724,7 +724,7 @@ TCXFreeScreen(int scrnIndex, int flags) /* Optional */ static ModeStatus -TCXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) +TCXValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) return(MODE_BAD); |