XLibre/xf86-video-r128
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-r128.git synced 2026-03-24 01:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop obsolete compat macros

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2026-01-02 15:53:39 +01:00
committed by Enrico Weigelt
parent 03f32cff93
commit f73503f839
5 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@@ -54,7 +54,6 @@ r128_drv_la_SOURCES = \
$(R128_DRI_SRCS)
EXTRA_DIST = \
compat-api.h \
r128.h \
r128_common.h \
r128_dri.h \

39
src/compat-api.h
View File

@@ -1,39 +0,0 @@
/*
* 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
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout
#define BLOCKHANDLER_ARGS pScreen, pTimeout
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
#endif
#endif

5
src/r128.h
View File

@@ -71,10 +71,7 @@
#include "fb.h"
#include "xf86Crtc.h"
#include "compat-api.h"
#include "atipcirename.h"
#include "r128_probe.h"
#if X_BYTE_ORDER == X_BIG_ENDIAN
@@ -303,7 +300,7 @@ typedef struct {
R128SaveRec SavedReg; /* Original (text) mode */
R128SaveRec ModeReg; /* Current mode */
Bool (*CloseScreen)(ScreenPtr pScreen);
void (*BlockHandler)(BLOCKHANDLER_ARGS_DECL);
void (*BlockHandler)(ScreenPtr pScreen, pointer pTimeout);
Bool PaletteSavedOnVT; /* Palette saved on last VT switch */

4
src/r128_driver.c
View File

@@ -1631,7 +1631,7 @@ static void R128LoadPalette(ScrnInfoPtr pScrn, int numColors,
}
static void
R128BlockHandler(BLOCKHANDLER_ARGS_DECL)
R128BlockHandler(ScreenPtr pScreen, pointer pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
R128InfoPtr info = R128PTR(pScrn);
@@ -1642,7 +1642,7 @@ R128BlockHandler(BLOCKHANDLER_ARGS_DECL)
#endif
pScreen->BlockHandler = info->BlockHandler;
(*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
(*pScreen->BlockHandler) (pScreen, pTimeout);
pScreen->BlockHandler = R128BlockHandler;
if(info->VideoTimerCallback) {

2
src/r128_probe.h
View File

@@ -41,8 +41,6 @@
#include "randrstr.h"
#include "xf86Crtc.h"
#include "compat-api.h"
#ifdef USE_EXA
#include "exa.h"
#endif