XLibre/xf86-video-trident
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-trident.git synced 2026-03-24 01:25:17 +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 16:35:31 +01:00
committed by Enrico Weigelt
parent 0c62065e4f
commit 6a8bd7febb
4 changed files with 2 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@@ -31,7 +31,6 @@ trident_drv_ladir = @moduledir@/drivers
trident_drv_la_SOURCES = \
blade_exa.c \
compat-api.h \
pci_rename.h \
trident_bank.c \
trident_dac.c \

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

1
src/trident.h
View File

@@ -45,7 +45,6 @@
#include "xf86Pci.h"
#include "vbe.h"
#include "compat-api.h"
#define LINEAR() (1)
#define PCI_VENDOR_TRIDENT 0x1023

4
src/trident_driver.c
View File

@@ -1022,13 +1022,13 @@ TRIDENTDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int
}
static void
TRIDENTBlockHandler (BLOCKHANDLER_ARGS_DECL)
TRIDENTBlockHandler (ScreenPtr pScreen, pointer pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
pScreen->BlockHandler = pTrident->BlockHandler;
(*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
(*pScreen->BlockHandler) (pScreen, pTimeout);
pScreen->BlockHandler = TRIDENTBlockHandler;
if(pTrident->VideoTimerCallback) {