XLibre/xf86-video-suncg6
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-suncg6.git synced 2026-03-24 01:25:09 +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:20:16 +01:00
committed by Enrico Weigelt
parent 60e6a9025c
commit 8b07470df0
3 changed files with 18 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@@ -32,5 +32,4 @@ suncg6_drv_la_SOURCES = \
cg6_cursor.c \
cg6_driver.c \
cg6.h \
cg6_regs.h \
compat-api.h
cg6_regs.h

38
src/cg6_driver.c
View File

@@ -33,26 +33,24 @@
#include "xf86cmap.h"
#include "cg6.h"
#include "compat-api.h"
static const OptionInfoRec * CG6AvailableOptions(int chipid, int busid);
static void CG6Identify(int flags);
static Bool CG6Probe(DriverPtr drv, int flags);
static Bool CG6PreInit(ScrnInfoPtr pScrn, int flags);
static Bool CG6ScreenInit(SCREEN_INIT_ARGS_DECL);
static Bool CG6EnterVT(VT_FUNC_ARGS_DECL);
static void CG6LeaveVT(VT_FUNC_ARGS_DECL);
static Bool CG6CloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool CG6ScreenInit(ScreenPtr pScreen, int argc, char **argv);
static Bool CG6EnterVT(ScrnInfoPtr arg);
static void CG6LeaveVT(ScrnInfoPtr arg);
static Bool CG6CloseScreen(ScreenPtr pScreen);
static Bool CG6SaveScreen(ScreenPtr pScreen, int mode);
/* Required if the driver supports mode switching */
static Bool CG6SwitchMode(SWITCH_MODE_ARGS_DECL);
static Bool CG6SwitchMode(ScrnInfoPtr arg, DisplayModePtr mode);
/* Required if the driver supports moving the viewport */
static void CG6AdjustFrame(ADJUST_FRAME_ARGS_DECL);
static void CG6AdjustFrame(ScrnInfoPtr arg, int x, int y);
/* Optional functions */
static void CG6FreeScreen(FREE_SCREEN_ARGS_DECL);
static ModeStatus CG6ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
static void CG6FreeScreen(ScrnInfoPtr arg);
static ModeStatus CG6ValidMode(ScrnInfoPtr arg, DisplayModePtr mode,
Bool verbose, int flags);
void CG6Sync(ScrnInfoPtr pScrn);
@@ -419,7 +417,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags)
/* This gets called at the start of each server generation */
static Bool
CG6ScreenInit(SCREEN_INIT_ARGS_DECL)
CG6ScreenInit(ScreenPtr pScreen, int argc, char **argv)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
Cg6Ptr pCg6;
@@ -537,7 +535,7 @@ CG6ScreenInit(SCREEN_INIT_ARGS_DECL)
/* Usually mandatory */
static Bool
CG6SwitchMode(SWITCH_MODE_ARGS_DECL)
CG6SwitchMode(ScrnInfoPtr arg, DisplayModePtr mode)
{
return TRUE;
}
@@ -549,7 +547,7 @@ CG6SwitchMode(SWITCH_MODE_ARGS_DECL)
*/
/* Usually mandatory */
static void
CG6AdjustFrame(ADJUST_FRAME_ARGS_DECL)
CG6AdjustFrame(ScrnInfoPtr arg, int x, int y)
{
/* we don't support virtual desktops */
return;
@@ -562,9 +560,8 @@ CG6AdjustFrame(ADJUST_FRAME_ARGS_DECL)
/* Mandatory */
static Bool
CG6EnterVT(VT_FUNC_ARGS_DECL)
CG6EnterVT(ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR(arg);
Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
if (pCg6->HWCursor) {
@@ -582,7 +579,7 @@ CG6EnterVT(VT_FUNC_ARGS_DECL)
/* Mandatory */
static void
CG6LeaveVT(VT_FUNC_ARGS_DECL)
CG6LeaveVT(ScrnInfoPtr arg)
{
return;
}
@@ -595,7 +592,7 @@ CG6LeaveVT(VT_FUNC_ARGS_DECL)
/* Mandatory */
static Bool
CG6CloseScreen(CLOSE_SCREEN_ARGS_DECL)
CG6CloseScreen(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn);
@@ -610,7 +607,7 @@ CG6CloseScreen(CLOSE_SCREEN_ARGS_DECL)
xf86SbusHideOsHwCursor(pCg6->psdp);
pScreen->CloseScreen = pCg6->CloseScreen;
return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
return (*pScreen->CloseScreen)(pScreen);
}
@@ -618,9 +615,8 @@ CG6CloseScreen(CLOSE_SCREEN_ARGS_DECL)
/* Optional */
static void
CG6FreeScreen(FREE_SCREEN_ARGS_DECL)
CG6FreeScreen(ScrnInfoPtr pScrn)
{
SCRN_INFO_PTR(arg);
CG6FreeRec(pScrn);
}
@@ -629,7 +625,7 @@ CG6FreeScreen(FREE_SCREEN_ARGS_DECL)
/* Optional */
static ModeStatus
CG6ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
CG6ValidMode(ScrnInfoPtr arg, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
return(MODE_BAD);

58
src/compat-api.h
View File

@@ -1,58 +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
#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
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#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)
#endif