From ac6e7154f1f78c7e8dee28dec9ac9f0445735db7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 7 Jun 2012 14:53:01 +0100 Subject: tga: port to new compat API. Signed-off-by: Dave Airlie --- src/Makefile.am | 1 + src/compat-api.h | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/tga.h | 2 ++ src/tga_accel.c | 2 +- src/tga_cursor.c | 2 +- src/tga_driver.c | 55 +++++++++++++++-------------- 6 files changed, 138 insertions(+), 29 deletions(-) create mode 100644 src/compat-api.h diff --git a/src/Makefile.am b/src/Makefile.am index f3d050f..634023b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,7 @@ tga_drv_la_SOURCES = \ BTramdac.c \ IBM561ramdac.c \ ICS1562.c \ + compat-api.h \ tga_accel.c \ tga_cursor.c \ tga_dac.c \ diff --git a/src/compat-api.h b/src/compat-api.h new file mode 100644 index 0000000..98ba435 --- /dev/null +++ b/src/compat-api.h @@ -0,0 +1,105 @@ +/* + * 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 + */ + +/* 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 WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask +#define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask + +#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 WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask +#define WAKEUPHANDLER_ARGS arg, result, read_mask + +#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/tga.h b/src/tga.h index 1f0f2ba..9e967e0 100644 --- a/src/tga.h +++ b/src/tga.h @@ -29,6 +29,8 @@ #include "xaa.h" #include "xf86RamDac.h" +#include "compat-api.h" + typedef struct { unsigned long tgaRegs[0x100]; } TGARegRec, *TGARegPtr; diff --git a/src/tga_accel.c b/src/tga_accel.c index cf9dfec..8a6dacf 100644 --- a/src/tga_accel.c +++ b/src/tga_accel.c @@ -102,7 +102,7 @@ DEC21030AccelInit(ScreenPtr pScreen) ScrnInfoPtr pScrn; TGAPtr pTga; - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pTga = TGAPTR(pScrn); /* ErrorF("DEC21030AccelInit called!"); */ diff --git a/src/tga_cursor.c b/src/tga_cursor.c index bbca45e..ade176f 100644 --- a/src/tga_cursor.c +++ b/src/tga_cursor.c @@ -158,7 +158,7 @@ TGASetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) Bool TGAHWCursorInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); TGAPtr pTga; xf86CursorInfoPtr infoPtr; diff --git a/src/tga_driver.c b/src/tga_driver.c index d6e61bd..1a3eca8 100644 --- a/src/tga_driver.c +++ b/src/tga_driver.c @@ -82,21 +82,20 @@ static const OptionInfoRec * TGAAvailableOptions(int chipid, int busid); static void TGAIdentify(int flags); static Bool TGAProbe(DriverPtr drv, int flags); static Bool TGAPreInit(ScrnInfoPtr pScrn, int flags); -static Bool TGAScreenInit(int Index, ScreenPtr pScreen, int argc, - char **argv); -static Bool TGAEnterVT(int scrnIndex, int flags); -static void TGALeaveVT(int scrnIndex, int flags); -static Bool TGACloseScreen(int scrnIndex, ScreenPtr pScreen); +static Bool TGAScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool TGAEnterVT(VT_FUNC_ARGS_DECL); +static void TGALeaveVT(VT_FUNC_ARGS_DECL); +static Bool TGACloseScreen(CLOSE_SCREEN_ARGS_DECL); static Bool TGASaveScreen(ScreenPtr pScreen, int mode); /* Required if the driver supports mode switching */ -static Bool TGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +static Bool TGASwitchMode(SWITCH_MODE_ARGS_DECL); /* Required if the driver supports moving the viewport */ -static void TGAAdjustFrame(int scrnIndex, int x, int y, int flags); +static void TGAAdjustFrame(ADJUST_FRAME_ARGS_DECL); /* Optional functions */ -static void TGAFreeScreen(int scrnIndex, int flags); -static ModeStatus TGAValidMode(int scrnIndex, DisplayModePtr mode, +static void TGAFreeScreen(FREE_SCREEN_ARGS_DECL); +static ModeStatus TGAValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags); /* Internally used functions */ @@ -1321,7 +1320,7 @@ TGARestore(ScrnInfoPtr pScrn) /* This gets called at the start of each server generation */ static Bool -TGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +TGAScreenInit(SCREEN_INIT_ARGS_DECL) { ScrnInfoPtr pScrn; TGAPtr pTga; @@ -1331,7 +1330,7 @@ TGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* * First get the ScrnInfoRec */ - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pTga = TGAPTR(pScrn); /* Map the TGA memory and MMIO areas */ @@ -1422,7 +1421,7 @@ TGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pScrn->displayWidth, pScrn->bitsPerPixel); break; default: - xf86DrvMsg(scrnIndex, X_ERROR, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Internal error: invalid bpp (%d) in TGAScrnInit\n", pScrn->bitsPerPixel); ret = FALSE; @@ -1545,9 +1544,10 @@ TGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Usually mandatory */ static Bool -TGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +TGASwitchMode(SWITCH_MODE_ARGS_DECL) { - return TGAModeInit(xf86Screens[scrnIndex], mode); + SCRN_INFO_PTR(arg); + return TGAModeInit(pScrn, mode); } @@ -1557,7 +1557,7 @@ TGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags) */ /* Usually mandatory */ static void -TGAAdjustFrame(int scrnIndex, int x, int y, int flags) +TGAAdjustFrame(ADJUST_FRAME_ARGS_DECL) { /* we don't support virtual desktops, because TGA doesn't have the ability to set the start of the visible framebuffer at an arbitrary @@ -1574,9 +1574,9 @@ TGAAdjustFrame(int scrnIndex, int x, int y, int flags) /* Mandatory */ static Bool -TGAEnterVT(int scrnIndex, int flags) +TGAEnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); /* Should we re-save the text mode on each VT enter? */ if (!TGAModeInit(pScrn, pScrn->currentMode)) @@ -1595,9 +1595,9 @@ TGAEnterVT(int scrnIndex, int flags) /* Mandatory */ static void -TGALeaveVT(int scrnIndex, int flags) +TGALeaveVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); /* TGAPtr pTga = TGAPTR(pScrn); */ TGARestore(pScrn); @@ -1615,9 +1615,9 @@ TGALeaveVT(int scrnIndex, int flags) /* Mandatory */ static Bool -TGACloseScreen(int scrnIndex, ScreenPtr pScreen) +TGACloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); TGAPtr pTga = TGAPTR(pScrn); TGARestore(pScrn); @@ -1630,7 +1630,7 @@ TGACloseScreen(int scrnIndex, ScreenPtr pScreen) pScrn->vtSema = FALSE; pScreen->CloseScreen = pTga->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } @@ -1638,10 +1638,11 @@ TGACloseScreen(int scrnIndex, ScreenPtr pScreen) /* Optional */ static void -TGAFreeScreen(int scrnIndex, int flags) +TGAFreeScreen(FREE_SCREEN_ARGS_DECL) { - RamDacFreeRec(xf86Screens[scrnIndex]); - TGAFreeRec(xf86Screens[scrnIndex]); + SCRN_INFO_PTR(arg); + RamDacFreeRec(pScrn); + TGAFreeRec(pScrn); } @@ -1649,7 +1650,7 @@ TGAFreeScreen(int scrnIndex, int flags) /* Optional */ static ModeStatus -TGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) +TGAValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) return(MODE_BAD); @@ -1671,7 +1672,7 @@ TGASaveScreen(ScreenPtr pScreen, int mode) int valid_reg = 0; Bool unblank; - pScrn = xf86Screens[pScreen->myNum]; + pScrn = xf86ScreenToScrn(pScreen); pTga = TGAPTR(pScrn); valid_reg = TGA_READ_REG(TGA_VALID_REG); valid_reg &= 0xFFFFFFFC; -- cgit v1.2.3