diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-06 12:39:10 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-06 12:39:10 +0100 |
commit | a5a9f9d7f69f812ef81557a50451efaa2f577cfb (patch) | |
tree | 7af10adb6d51341c519503f8519aa8b737129ea4 | |
parent | 8c1121725c4dc1a81dd1af74b83405a1cb69562e (diff) |
voodoo: add 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/voodoo.h | 2 | ||||
-rw-r--r-- | src/voodoo_dga.c | 2 | ||||
-rw-r--r-- | src/voodoo_driver.c | 44 | ||||
-rw-r--r-- | src/voodoo_hardware.c | 8 |
6 files changed, 129 insertions, 27 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5eb704e..c145c27 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,7 @@ voodoo_drv_la_LDFLAGS = -module -avoid-version voodoo_drv_ladir = @moduledir@/drivers voodoo_drv_la_SOURCES = \ + compat-api.h \ voodoo_dga.c \ voodoo_driver.c \ voodoo.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 diff --git a/src/voodoo.h b/src/voodoo.h index 11a62c9..5cb3799 100644 --- a/src/voodoo.h +++ b/src/voodoo.h @@ -1,6 +1,8 @@ #include "voodoo_pcirename.h" #include <string.h> +#include "compat-api.h" + typedef struct { CARD32 m; CARD32 n; diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c index 146de84..74bff97 100644 --- a/src/voodoo_dga.c +++ b/src/voodoo_dga.c @@ -105,7 +105,7 @@ static Bool VoodooDGASetMode(ScrnInfoPtr pScrn, DGAModePtr pDGAMode) frameY0 = pScrn->frameY0; } - if (!(*pScrn->SwitchMode)(scrnIdx, pMode, 0)) + if (!(*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pMode))) return FALSE; return TRUE; } diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c index 6dad301..08325e3 100644 --- a/src/voodoo_driver.c +++ b/src/voodoo_driver.c @@ -79,15 +79,15 @@ static const OptionInfoRec * VoodooAvailableOptions(int chipid, int busid); static void VoodooIdentify(int flags); static Bool VoodooProbe(DriverPtr drv, int flags); static Bool VoodooPreInit(ScrnInfoPtr pScrn, int flags); -static Bool VoodooScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv); -static Bool VoodooEnterVT(int scrnIndex, int flags); -static void VoodooLeaveVT(int scrnIndex, int flags); -static Bool VoodooCloseScreen(int scrnIndex, ScreenPtr pScreen); +static Bool VoodooScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool VoodooEnterVT(VT_FUNC_ARGS_DECL); +static void VoodooLeaveVT(VT_FUNC_ARGS_DECL); +static Bool VoodooCloseScreen(CLOSE_SCREEN_ARGS_DECL); static Bool VoodooSaveScreen(ScreenPtr pScreen, int mode); -static void VoodooFreeScreen(int scrnIndex, int flags); +static void VoodooFreeScreen(FREE_SCREEN_ARGS_DECL); static void VoodooRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox); static void VoodooRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox); -static Bool VoodooSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +static Bool VoodooSwitchMode(SWITCH_MODE_ARGS_DECL); static Bool VoodooModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); static void VoodooRestore(ScrnInfoPtr pScrn, Bool Closing); @@ -580,7 +580,7 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags) /* Mandatory */ /* This gets called at the start of each server generation */ static Bool -VoodooScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +VoodooScreenInit(SCREEN_INIT_ARGS_DECL) { ScrnInfoPtr pScrn; VoodooPtr pVoo; @@ -592,7 +592,7 @@ VoodooScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* * First get the ScrnInfoRec */ - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pVoo = VoodooPTR(pScrn); @@ -730,9 +730,9 @@ VoodooScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Mandatory */ static Bool -VoodooEnterVT(int scrnIndex, int flags) +VoodooEnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); return VoodooModeInit(pScrn, pScrn->currentMode); } @@ -745,9 +745,9 @@ VoodooEnterVT(int scrnIndex, int flags) /* Mandatory */ static void -VoodooLeaveVT(int scrnIndex, int flags) +VoodooLeaveVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); VoodooRestore(pScrn, FALSE); } @@ -760,9 +760,9 @@ VoodooLeaveVT(int scrnIndex, int flags) /* Mandatory */ static Bool -VoodooCloseScreen(int scrnIndex, ScreenPtr pScreen) +VoodooCloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); if (pScrn->vtSema) @@ -780,7 +780,7 @@ VoodooCloseScreen(int scrnIndex, ScreenPtr pScreen) pScrn->vtSema = FALSE; pScreen->CloseScreen = pVoo->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } @@ -788,9 +788,9 @@ VoodooCloseScreen(int scrnIndex, ScreenPtr pScreen) /* Optional */ static void -VoodooFreeScreen(int scrnIndex, int flags) +VoodooFreeScreen(FREE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); VoodooPtr pVoo = VoodooPTR(pScrn); /* * This only gets called when a screen is being deleted. It does not @@ -798,7 +798,7 @@ VoodooFreeScreen(int scrnIndex, int flags) */ if (pVoo && pVoo->ShadowPtr) free(pVoo->ShadowPtr); - VoodooFreeRec(xf86Screens[scrnIndex]); + VoodooFreeRec(pScrn); } @@ -814,7 +814,7 @@ VoodooSaveScreen(ScreenPtr pScreen, int mode) unblank = xf86IsUnblank(mode); if(pScreen != NULL) { - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pVoo = VoodooPTR(pScrn); if(pScrn->vtSema && (unblank == pVoo->Blanked)) @@ -878,11 +878,11 @@ VoodooModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) * this is needed but it does no harm. */ -static Bool VoodooSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +static Bool VoodooSwitchMode(SWITCH_MODE_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); VoodooSync(pScrn); - return VoodooModeInit(xf86Screens[scrnIndex], mode); + return VoodooModeInit(pScrn, mode); } static void diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c index 364f33f..88e937d 100644 --- a/src/voodoo_hardware.c +++ b/src/voodoo_hardware.c @@ -811,7 +811,7 @@ void VoodooClear(VoodooPtr pVoo) void VoodooReadBank(ScreenPtr pScreen, int bank) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); if(bank) { @@ -828,7 +828,7 @@ void VoodooReadBank(ScreenPtr pScreen, int bank) void VoodooWriteBank(ScreenPtr pScreen, int bank) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); if(bank) { @@ -846,7 +846,7 @@ void VoodooWriteBank(ScreenPtr pScreen, int bank) #if 0 static void VoodooReadWriteBank(ScreenPtr pScreen, int bank) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); if(bank) { @@ -1389,7 +1389,7 @@ CARD32 VoodooTextureFormats[3] = {PICT_a8r8g8b8, PICT_x8r8g8b8, 0}; void Voodoo2XAAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VoodooPtr pVoo = VoodooPTR(pScrn); XAAInfoRecPtr pAccel = XAACreateInfoRec(); BoxRec cacheArea; |