diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-14 15:25:11 +0200 |
|---|---|---|
| committer | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-24 10:00:47 +0200 |
| commit | 49d50f1fdeb4dc81895fec81be9fae1dc78e5974 (patch) | |
| tree | 26a0764f3db3d5bea0fe7f1ed6913c7477ba206f /src | |
| parent | bf8ab01902b9fa7d640740d5ff5542b324d0ec68 (diff) | |
We're relying on at least 1.18 now
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-rendition/-/merge_requests/4>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compat-api.h | 41 | ||||
| -rw-r--r-- | src/rendition.c | 4 | ||||
| -rw-r--r-- | src/rendition.h | 8 |
3 files changed, 0 insertions, 53 deletions
diff --git a/src/compat-api.h b/src/compat-api.h index e4f03d2..826b968 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -28,45 +28,6 @@ #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 pScreenInfo = 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 pScreenInfo->scrnIndex, 0 - -#define XF86_SCRN_ARG(x) ((x)->scrnIndex) -#else #define SCRN_ARG_TYPE ScrnInfoPtr #define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScreenInfo = (arg1) @@ -95,5 +56,3 @@ #define XF86_SCRN_ARG(x) (x) #endif - -#endif diff --git a/src/rendition.c b/src/rendition.c index 836910f..fd963ba 100644 --- a/src/rendition.c +++ b/src/rendition.c @@ -654,11 +654,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags) vgaHWSetStdFuncs(pvgaHW); vgaHWGetIOBase(pvgaHW); /* Get VGA I/O base */ -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pRendition->board.vgaio_base = pvgaHW->PIOOffset; -#else pRendition->board.vgaio_base = 0; -#endif pRendition->board.io_base = pRendition->board.vgaio_base #ifdef XSERVER_LIBPCIACCESS + pRendition->PciInfo->regions[1].base_addr; diff --git a/src/rendition.h b/src/rendition.h index 4ef03a7..c497589 100644 --- a/src/rendition.h +++ b/src/rendition.h @@ -28,14 +28,6 @@ /* All drivers using the mi colormap manipulation need this */ #include "micmap.h" -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 -/* Needed by Resources Access Control (RAC) */ -#include "xf86RAC.h" - -/* Several predefined resource lists */ -#include "xf86Resources.h" -#endif - /* Needed by the Shadow Framebuffer */ #include "shadowfb.h" |