From 54dcbfeb2b29bc2aea3916f38554d4e9b7141889 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 14 May 2024 15:43:08 +0200
Subject: drop support for ancient xserver versions

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-savage/-/merge_requests/10>
---
 src/compat-api.h | 44 --------------------------------------------
 src/savage_i2c.c | 13 -------------
 2 files changed, 57 deletions(-)

diff --git a/src/compat-api.h b/src/compat-api.h
index 7cf29d0..b5d8d8f 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -28,48 +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 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)
 
@@ -109,5 +67,3 @@
 #define XF86_SCRN_ARG(x) (x)
 
 #endif
-
-#endif
diff --git a/src/savage_i2c.c b/src/savage_i2c.c
index a37fc7f..d8def10 100644
--- a/src/savage_i2c.c
+++ b/src/savage_i2c.c
@@ -37,11 +37,7 @@ in this Software without prior written authorization from the XFree86 Project.
 static void
 SavageI2CPutBits(I2CBusPtr b, int clock,  int data)
 {
-#ifdef XF86_SCRN_INTERFACE
     ScrnInfoPtr pScrn = b->pScrn;
-#else
-    ScrnInfoPtr pScrn = (ScrnInfoPtr)(xf86Screens[b->scrnIndex]);
-#endif
     SavagePtr psav = SAVPTR(pScrn);
     unsigned char reg = 0x10;
 
@@ -55,11 +51,7 @@ SavageI2CPutBits(I2CBusPtr b, int clock,  int data)
 static void
 SavageI2CGetBits(I2CBusPtr b, int *clock, int *data)
 {
-#ifdef XF86_SCRN_INTERFACE
     ScrnInfoPtr pScrn = b->pScrn;
-#else
-    ScrnInfoPtr pScrn = (ScrnInfoPtr)(xf86Screens[b->scrnIndex]);
-#endif
     SavagePtr psav = SAVPTR(pScrn);
     unsigned char reg = 0x10;
 
@@ -84,9 +76,7 @@ SavageI2CInit(ScrnInfoPtr pScrn)
 
     I2CPtr->BusName    = "I2C bus";
     I2CPtr->scrnIndex  = pScrn->scrnIndex;
-#ifdef XF86_SCRN_INTERFACE
     I2CPtr->pScrn  = pScrn;
-#endif
     I2CPtr->I2CPutBits = SavageI2CPutBits;
     I2CPtr->I2CGetBits = SavageI2CGetBits;
 
@@ -95,6 +85,3 @@ SavageI2CInit(ScrnInfoPtr pScrn)
 
     return TRUE;
 }
-
-
-
-- 
cgit v1.2.3