diff options
author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-23 19:41:46 +0200 |
---|---|---|
committer | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-28 17:03:00 +0200 |
commit | d610334264e82a18477b9a5c3a4095c49c18f47b (patch) | |
tree | 7d7bf3e3e9edc11b68719f208f8974fc59ce71ca /src | |
parent | 3f312e68c5c3b29dbe81f1f7e83dc20eddfa8d15 (diff) |
Relying on >= 1.18 now, no need to keep compat with older ones.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-i740/-/merge_requests/8>
Diffstat (limited to 'src')
-rw-r--r-- | src/compat-api.h | 73 | ||||
-rw-r--r-- | src/i740.h | 4 | ||||
-rw-r--r-- | src/i740_dga.c | 8 | ||||
-rw-r--r-- | src/i740_driver.c | 46 | ||||
-rw-r--r-- | src/i740_video.c | 1 |
5 files changed, 28 insertions, 104 deletions
diff --git a/src/compat-api.h b/src/compat-api.h index 89976e4..35e22b4 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -28,77 +28,12 @@ #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 - #if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -#define BLOCKHANDLER_ARGS arg, pTimeout +#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout +#define BLOCKHANDLER_ARGS pScreen, pTimeout #else -#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -#endif - -#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) - +#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask #endif #endif @@ -153,8 +153,8 @@ void I740SetPIOAccess(I740Ptr pI740); void I740SetMMIOAccess(I740Ptr pI740); void I740InitVideo(ScreenPtr pScreen); -Bool I740SwitchMode(SWITCH_MODE_ARGS_DECL); -void I740AdjustFrame(ADJUST_FRAME_ARGS_DECL); +Bool I740SwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode); +void I740AdjustFrame(ScrnInfoPtr pScrn, int x, int y); Bool I740_I2CInit(ScrnInfoPtr pScrn); diff --git a/src/i740_dga.c b/src/i740_dga.c index b019dc6..e03d329 100644 --- a/src/i740_dga.c +++ b/src/i740_dga.c @@ -129,8 +129,8 @@ I740_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode) if (!pMode) { /* restore the original mode */ if (pI740->DGAactive) { pScrn->currentMode = I740SavedDGAModes[index]; - I740SwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode)); - I740AdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0)); + I740SwitchMode(pScrn, pScrn->currentMode); + I740AdjustFrame(pScrn, 0, 0); pI740->DGAactive = FALSE; } } @@ -140,7 +140,7 @@ I740_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode) pI740->DGAactive = TRUE; } - I740SwitchMode(SWITCH_MODE_ARGS(pScrn, pMode->mode)); + I740SwitchMode(pScrn, pMode->mode); } return TRUE; @@ -160,7 +160,7 @@ I740_SetViewport(ScrnInfoPtr pScrn, int x, int y, int flags) I740Ptr pI740 = I740PTR(pScrn); vgaHWPtr hwp = VGAHWPTR(pScrn); - I740AdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y)); + I740AdjustFrame(pScrn, x, y); /* wait for retrace */ while ((hwp->readST01(hwp) & 0x08)); diff --git a/src/i740_driver.c b/src/i740_driver.c index dc5cdc2..75e57b5 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -97,25 +97,25 @@ static Bool I740Probe(DriverPtr drv, int flags); static Bool I740PreInit(ScrnInfoPtr pScrn, int flags); /* Initialize a screen */ -static Bool I740ScreenInit(SCREEN_INIT_ARGS_DECL); +static Bool I740ScreenInit(ScreenPtr pScreen, int argc, char **argv); /* Enter from a virtual terminal */ -static Bool I740EnterVT(VT_FUNC_ARGS_DECL); +static Bool I740EnterVT(ScrnInfoPtr pScrn); /* Leave to a virtual terminal */ -static void I740LeaveVT(VT_FUNC_ARGS_DECL); +static void I740LeaveVT(ScrnInfoPtr pScrn); /* Close down each screen we initialized */ -static Bool I740CloseScreen(CLOSE_SCREEN_ARGS_DECL); +static Bool I740CloseScreen(ScreenPtr pScreen); /* Change screensaver state */ static Bool I740SaveScreen(ScreenPtr pScreen, int mode); /* Cleanup server private data */ -static void I740FreeScreen(FREE_SCREEN_ARGS_DECL); +static void I740FreeScreen(ScrnInfoPtr pScrn); /* Check if a mode is valid on the hardware */ -static ModeStatus I740ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, +static ModeStatus I740ValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags); /* Switch to various Display Power Management System levels */ @@ -708,10 +708,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) if (I740MapMem(pScrn)) { if (I740_I2CInit(pScrn)) { xf86MonPtr MonInfo; - - if ((MonInfo = - xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn), - pI740->rc_i2c))) { + if ((MonInfo = xf86DoEDID_DDC2(pScrn, pI740->rc_i2c))) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n", MonInfo); xf86PrintEDID(MonInfo); @@ -1579,7 +1576,7 @@ I740LoadPalette24(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, } static Bool -I740ScreenInit(SCREEN_INIT_ARGS_DECL) +I740ScreenInit(ScreenPtr pScreen, int argc, char **argv) { ScrnInfoPtr pScrn; vgaHWPtr hwp; @@ -1606,7 +1603,7 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) return FALSE; I740SaveScreen(pScreen, SCREEN_SAVER_ON); - I740AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); + I740AdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0); miClearVisualTypes(); @@ -1723,16 +1720,14 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) } Bool -I740SwitchMode(SWITCH_MODE_ARGS_DECL) +I740SwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode) { - SCRN_INFO_PTR(arg); return I740ModeInit(pScrn, mode); } void -I740AdjustFrame(ADJUST_FRAME_ARGS_DECL) +I740AdjustFrame(ScrnInfoPtr pScrn, int x, int y) { - SCRN_INFO_PTR(arg); int Base; vgaHWPtr hwp; @@ -1766,20 +1761,17 @@ I740AdjustFrame(ADJUST_FRAME_ARGS_DECL) } static Bool -I740EnterVT(VT_FUNC_ARGS_DECL) +I740EnterVT(ScrnInfoPtr pScrn) { - SCRN_INFO_PTR(arg); - if (!I740ModeInit(pScrn, pScrn->currentMode)) return FALSE; - I740AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); + I740AdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0); return TRUE; } static void -I740LeaveVT(VT_FUNC_ARGS_DECL) +I740LeaveVT(ScrnInfoPtr pScrn) { - SCRN_INFO_PTR(arg); vgaHWPtr hwp; hwp = VGAHWPTR(pScrn); @@ -1788,7 +1780,7 @@ I740LeaveVT(VT_FUNC_ARGS_DECL) } static Bool -I740CloseScreen(CLOSE_SCREEN_ARGS_DECL) +I740CloseScreen(ScreenPtr pScreen) { ScrnInfoPtr pScrn; vgaHWPtr hwp; @@ -1811,22 +1803,20 @@ I740CloseScreen(CLOSE_SCREEN_ARGS_DECL) pScrn->vtSema = FALSE; pScreen->CloseScreen = pI740->CloseScreen; - return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); + return (*pScreen->CloseScreen) (pScreen); } static void -I740FreeScreen(FREE_SCREEN_ARGS_DECL) +I740FreeScreen(ScrnInfoPtr pScrn) { - SCRN_INFO_PTR(arg); I740FreeRec(pScrn); if (xf86LoaderCheckSymbol("vgaHWFreeHWRec")) vgaHWFreeHWRec(pScrn); } static ModeStatus -I740ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) +I740ValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags) { - SCRN_INFO_PTR(arg); if (mode->Flags & V_INTERLACE) { if (verbose) { xf86DrvMsg(pScrn->scrnIndex, X_PROBED, diff --git a/src/i740_video.c b/src/i740_video.c index 958d4e8..1f7e9b9 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -908,7 +908,6 @@ I740QueryImageAttributes(ScrnInfoPtr pScrn, int id, unsigned short *w, static void I740BlockHandler(BLOCKHANDLER_ARGS_DECL) { - SCREEN_PTR(arg); ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); I740Ptr pI740 = I740PTR(pScrn); I740PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn); |