diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-06 12:28:19 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-06 12:28:19 +0100 |
commit | de082dae48030b8a5c1cc2474fe3008170d62eea (patch) | |
tree | a55a567a57399bfc929d3f84e8a7765ca47eb616 | |
parent | 02451944ba73887db9803f44a1826059d9105963 (diff) |
sisusb: add support for compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/compat-api.h | 99 | ||||
-rw-r--r-- | src/sisusb.h | 2 | ||||
-rw-r--r-- | src/sisusb_accel.c | 2 | ||||
-rw-r--r-- | src/sisusb_cursor.c | 6 | ||||
-rw-r--r-- | src/sisusb_driver.c | 53 | ||||
-rw-r--r-- | src/sisusb_driver.h | 16 | ||||
-rw-r--r-- | src/sisusb_vga.c | 2 | ||||
-rw-r--r-- | src/sisusb_video.c | 6 |
9 files changed, 146 insertions, 43 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5e1735f..1f7e4a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,4 +51,5 @@ sisusb_drv_la_SOURCES = \ sisusb_vga.c \ sisusb_video.c \ sisusb_video.h \ - sisusb_videostr.h + sisusb_videostr.h \ + compat-api.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/sisusb.h b/src/sisusb.h index 82ed509..f66b701 100644 --- a/src/sisusb.h +++ b/src/sisusb.h @@ -113,6 +113,8 @@ #include <X11/extensions/Xv.h> #endif +#include "compat-api.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 #define _swapl(x, n) swapl(x,n) #define _swaps(x, n) swaps(x,n) diff --git a/src/sisusb_accel.c b/src/sisusb_accel.c index d9c0665..c973a4c 100644 --- a/src/sisusb_accel.c +++ b/src/sisusb_accel.c @@ -60,7 +60,7 @@ SiSUSBInitializeAccelerator(ScrnInfoPtr pScrn) Bool SiSUSBAccelInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); int topFB, reservedFbSize, usableFbSize; BoxRec Avail; diff --git a/src/sisusb_cursor.c b/src/sisusb_cursor.c index b5b3629..9782f9e 100644 --- a/src/sisusb_cursor.c +++ b/src/sisusb_cursor.c @@ -156,7 +156,7 @@ SiSUSBLoadCursorImage(ScrnInfoPtr pScrn, UChar *src) static Bool SiSUSBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); DisplayModePtr mode = pSiSUSB->CurrentLayout.mode; @@ -172,7 +172,7 @@ SiSUSBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) static Bool SiSUSBUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); DisplayModePtr mode = pSiSUSB->CurrentLayout.mode; @@ -261,7 +261,7 @@ static void SiSUSBLoadCursorImageARGB(ScrnInfoPtr pScrn, CursorPtr pCurs) Bool SiSUSBHWCursorInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); xf86CursorInfoPtr infoPtr; diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c index 032225c..208cdbe 100644 --- a/src/sisusb_driver.c +++ b/src/sisusb_driver.c @@ -1638,10 +1638,10 @@ SISUSBBridgeRestore(ScrnInfoPtr pScrn) /* Our generic BlockHandler for Xv */ static void -SISUSBBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask) +SISUSBBlockHandler(BLOCKHANDLER_ARGS_DECL) { - ScreenPtr pScreen = screenInfo.screens[i]; - ScrnInfoPtr pScrn = xf86Screens[i]; + SCREEN_PTR(arg); + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); if((pSiSUSB->sisusbfatalerror) && (pSiSUSB->timeout != -1)) { @@ -1651,7 +1651,7 @@ SISUSBBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask pSiSUSB->sisusberrorsleepcount = 0; pSiSUSB->sisusbfatalerror = 0; pSiSUSB->sisusbdevopen = TRUE; - (*pScrn->SwitchMode)(pScrn->scrnIndex, pScrn->currentMode, 0); + (*pScrn->SwitchMode)(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); pSiSUSB->ShBoxcount = 1; pSiSUSB->ShXmin = pSiSUSB->ShYmin = 0; pSiSUSB->ShXmax = pScrn->virtualX; @@ -1669,7 +1669,7 @@ SISUSBBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask SISUSBDoRefreshArea(pScrn); pScreen->BlockHandler = pSiSUSB->BlockHandler; - (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); + (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); pScreen->BlockHandler = SISUSBBlockHandler; if(pSiSUSB->VideoTimerCallback) { @@ -1686,9 +1686,9 @@ SISUSBBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask * depth, bitsPerPixel) */ static Bool -SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +SISUSBScreenInit(SCREEN_INIT_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); int ret; VisualPtr visual; @@ -1784,7 +1784,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) SISUSBSaveScreen(pScreen, SCREEN_SAVER_ON); /* Set the viewport */ - SISUSBAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); + SISUSBAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); /* Reset visual list. */ miClearVisualTypes(); @@ -2044,13 +2044,13 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Usually mandatory */ Bool -SISUSBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +SISUSBSwitchMode(SWITCH_MODE_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); if(!pSiSUSB->skipswitchcheck) { - if(SISUSBValidMode(scrnIndex, mode, TRUE, flags) != MODE_OK) { + if(SISUSBValidMode(arg, mode, TRUE, 0) != MODE_OK) { return FALSE; } } @@ -2061,7 +2061,7 @@ SISUSBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) } #endif - if(!(SISUSBModeInit(xf86Screens[scrnIndex], mode))) return FALSE; + if(!(SISUSBModeInit(pScrn, mode))) return FALSE; return TRUE; } @@ -2089,9 +2089,9 @@ SISUSBSetStartAddressCRT1(SISUSBPtr pSiSUSB, ULong base) * Usually mandatory */ void -SISUSBAdjustFrame(int scrnIndex, int x, int y, int flags) +SISUSBAdjustFrame(ADJUST_FRAME_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); ULong base; @@ -2130,9 +2130,9 @@ SISUSBAdjustFrame(int scrnIndex, int x, int y, int flags) * Mandatory! */ static Bool -SISUSBEnterVT(int scrnIndex, int flags) +SISUSBEnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); SiSUSB_SiSFB_Lock(pScrn, TRUE); @@ -2148,7 +2148,7 @@ SISUSBEnterVT(int scrnIndex, int flags) return FALSE; } - SISUSBAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); + SISUSBAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); if(pSiSUSB->ResetXv) { (pSiSUSB->ResetXv)(pScrn); @@ -2163,9 +2163,9 @@ SISUSBEnterVT(int scrnIndex, int flags) * Mandatory! */ static void -SISUSBLeaveVT(int scrnIndex, int flags) +SISUSBLeaveVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); if(pSiSUSB->CursorInfoPtr) { @@ -2197,9 +2197,9 @@ SISUSBLeaveVT(int scrnIndex, int flags) * Mandatory! */ static Bool -SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen) +SISUSBCloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); if(pSiSUSB->SiSCtrlExtEntry) { @@ -2273,7 +2273,7 @@ SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen) pScreen->CloseScreen = pSiSUSB->CloseScreen; - return(*pScreen->CloseScreen)(scrnIndex, pScreen); + return(*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } @@ -2281,18 +2281,19 @@ SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen) /* Optional */ static void -SISUSBFreeScreen(int scrnIndex, int flags) +SISUSBFreeScreen(FREE_SCREEN_ARGS_DECL) { - SISUSBFreeRec(xf86Screens[scrnIndex]); + SCRN_INFO_PTR(arg); + SISUSBFreeRec(pScrn); } /* Checks if a mode is suitable for the selected chipset. */ static ModeStatus -SISUSBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) +SISUSBValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); if(SiSUSB_CheckModeCRT1(pScrn, mode, pSiSUSB->VBFlags, pSiSUSB->HaveCustomModes) < 0x14) diff --git a/src/sisusb_driver.h b/src/sisusb_driver.h index c4bc1dd..d0002d1 100644 --- a/src/sisusb_driver.h +++ b/src/sisusb_driver.h @@ -71,20 +71,20 @@ static const struct _sis_vrate { static void SISUSBIdentify(int flags); static Bool SISUSBProbe(DriverPtr drv, int flags); static Bool SISUSBPreInit(ScrnInfoPtr pScrn, int flags); -static Bool SISUSBScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv); -static Bool SISUSBEnterVT(int scrnIndex, int flags); -static void SISUSBLeaveVT(int scrnIndex, int flags); -static Bool SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen); +static Bool SISUSBScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool SISUSBEnterVT(VT_FUNC_ARGS_DECL); +static void SISUSBLeaveVT(VT_FUNC_ARGS_DECL); +static Bool SISUSBCloseScreen(CLOSE_SCREEN_ARGS_DECL); static Bool SISUSBSaveScreen(ScreenPtr pScreen, int mode); -static Bool SISUSBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); -static void SISUSBAdjustFrame(int scrnIndex, int x, int y, int flags); +static Bool SISUSBSwitchMode(SWITCH_MODE_ARGS_DECL); +static void SISUSBAdjustFrame(ADJUST_FRAME_ARGS_DECL); #ifdef SISUSB_HAVE_DRIVER_FUNC static Bool SISUSBDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer p); #endif /* Optional functions */ -static void SISUSBFreeScreen(int scrnIndex, int flags); -static ModeStatus SISUSBValidMode(int scrnIndex, DisplayModePtr mode, +static void SISUSBFreeScreen(FREE_SCREEN_ARGS_DECL); +static ModeStatus SISUSBValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags); /* Internally used functions */ diff --git a/src/sisusb_vga.c b/src/sisusb_vga.c index 404a2b1..1c9761d 100644 --- a/src/sisusb_vga.c +++ b/src/sisusb_vga.c @@ -327,7 +327,7 @@ SiSUSBVGASaveScreen(ScreenPtr pScreen, int mode) if(pScreen == NULL) return FALSE; - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); if(pScrn->vtSema) { SISUSBVGABlankScreen(pScrn, on); diff --git a/src/sisusb_video.c b/src/sisusb_video.c index 1dbf4f1..9340696 100644 --- a/src/sisusb_video.c +++ b/src/sisusb_video.c @@ -196,7 +196,7 @@ SISUSBResetXvGamma(ScrnInfoPtr pScrn) void SISUSBInitVideo(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL; XF86VideoAdaptorPtr newAdaptor = NULL; int num_adaptors; @@ -372,7 +372,7 @@ set_maxencoding(SISUSBPtr pSiSUSB, SISUSBPortPrivPtr pPriv) static XF86VideoAdaptorPtr SISUSBSetupImageVideo(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SISUSBPtr pSiSUSB = SISUSBPTR(pScrn); XF86VideoAdaptorPtr adapt; SISUSBPortPrivPtr pPriv; @@ -1477,7 +1477,7 @@ SISUSBAllocateOverlayMemory( xf86FreeOffscreenLinear(linear); } - pScreen = screenInfo.screens[pScrn->scrnIndex]; + pScreen = xf86ScrnToScreen(pScrn); new_linear = xf86AllocateOffscreenLinear(pScreen, size, 8, NULL, NULL, NULL); |