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

replace obsolete "pointer" typedef by plain void*

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-05 20:06:19 +01:00
committed by Enrico Weigelt
parent 9c8216677e
commit c237282dff
5 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/savage_dri.c
View File

@@ -116,7 +116,7 @@ static void SAVAGEWakeupHandler(ScreenPtr pScreen, int result)
/* FK: this flag doesn't seem to be used. */
}
static void SAVAGEBlockHandler(ScreenPtr pScreen, pointer pTimeout)
static void SAVAGEBlockHandler(ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SavagePtr psav = SAVPTR(pScrn);
@@ -605,7 +605,7 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
pDRIInfo->ddxDriverMinorVersion = SAVAGE_VERSION_MINOR;
pDRIInfo->ddxDriverPatchVersion = SAVAGE_PATCHLEVEL;
pDRIInfo->frameBufferPhysicalAddress = (pointer)(uintptr_t) psav->FbRegion.base;
pDRIInfo->frameBufferPhysicalAddress = (uintptr_t) psav->FbRegion.base;
pDRIInfo->frameBufferSize = psav->videoRambytes;
pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8);
pDRIInfo->ddxDrawableTableEntry = SAVAGE_MAX_DRAWABLES;

6
src/savage_driver.c
View File

@@ -310,7 +310,7 @@ _X_EXPORT XF86ModuleData savageModuleData = {
NULL
};
static pointer SavageSetup(pointer module, pointer opts, int *errmaj,
static void *SavageSetup(void *module, void *opts, int *errmaj,
int *errmin)
{
static Bool setupDone = FALSE;
@@ -318,7 +318,7 @@ static pointer SavageSetup(pointer module, pointer opts, int *errmaj,
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&SAVAGE, module, 1);
return (pointer) 1;
return (void*) 1;
} else {
if (errmaj)
*errmaj = LDR_ONCEONLY;
@@ -682,7 +682,7 @@ static Bool SavagePciProbe(DriverPtr drv, int entity_num,
static void SavageDoDDC(ScrnInfoPtr pScrn)
{
SavagePtr psav= SAVPTR(pScrn);
pointer ddc;
void *ddc;
/* Do the DDC dance. */ /* S3/VIA's DDC code */
ddc = xf86LoadSubModule(pScrn, "ddc");

2
src/savage_driver.h
View File

@@ -272,7 +272,7 @@ typedef union _BMPDESC {
typedef struct _StatInfo {
int origMode;
int pageCnt;
pointer statBuf;
void *statBuf;
int realSeg;
int realOff;
} StatInfoRec,*StatInfoPtr;

2
src/savage_vbe.c
View File

@@ -274,7 +274,7 @@ SavageGetBIOSModes(
{
unsigned short iModeCount = 0;
unsigned short int *mode_list;
pointer vbeLinear = NULL;
void *vbeLinear = NULL;
int vbeReal;
struct vbe_mode_info_block * vmib;

30
src/savage_video.c
View File

@@ -50,14 +50,14 @@ void savageOUTREG( SavagePtr psav, unsigned long offset, unsigned long value );
static XF86VideoAdaptorPtr SavageSetupImageVideo(ScreenPtr);
static void SavageInitOffscreenImages(ScreenPtr);
static void SavageStopVideo(ScrnInfoPtr, pointer, Bool);
static int SavageSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
static int SavageGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
static void SavageStopVideo(ScrnInfoPtr, void*, Bool);
static int SavageSetPortAttribute(ScrnInfoPtr, Atom, INT32, void*);
static int SavageGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, void*);
static void SavageQueryBestSize(ScrnInfoPtr, Bool,
short, short, short, short, unsigned int *, unsigned int *, pointer);
short, short, short, short, unsigned int *, unsigned int *, void*);
static int SavagePutImage( ScrnInfoPtr,
short, short, short, short, short, short, short, short,
int, unsigned char*, short, short, Bool, RegionPtr, pointer,
int, unsigned char*, short, short, Bool, RegionPtr, void*,
DrawablePtr);
static int SavageQueryImageAttributes(ScrnInfoPtr,
int, unsigned short *, unsigned short *, int *, int *);
@@ -110,8 +110,6 @@ static void (*SavageDisplayVideo)(
short drw_w, short drw_h
) = NULL;
/*static void SavageBlockHandler(int, pointer, pointer, pointer);*/
#define XVTRACE 4
#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
@@ -817,7 +815,7 @@ SavageSetupImageVideo(ScreenPtr pScreen)
adapt->nPorts = 1;
adapt->pPortPrivates = (DevUnion*)(&adapt[1]);
pPriv = (SavagePortPrivPtr)(&adapt->pPortPrivates[1]);
adapt->pPortPrivates[0].ptr = (pointer)(pPriv);
adapt->pPortPrivates[0].ptr = pPriv;
adapt->pAttributes = Attributes;
adapt->nImages = NUM_IMAGES;
adapt->nAttributes = NUM_ATTRIBUTES;
@@ -938,7 +936,7 @@ SavageClipVideo(
}
static void
SavageStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
SavageStopVideo(ScrnInfoPtr pScrn, void *data, Bool shutdown)
{
SavagePortPrivPtr pPriv = (SavagePortPrivPtr)data;
#ifdef SAVAGEDRI
@@ -989,7 +987,7 @@ SavageSetPortAttribute(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 value,
pointer data
void *data
){
SavagePortPrivPtr pPriv = (SavagePortPrivPtr)data;
SavagePtr psav = SAVPTR(pScrn);
@@ -1047,7 +1045,7 @@ SavageGetPortAttribute(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 *value,
pointer data
void *data
){
SavagePortPrivPtr pPriv = (SavagePortPrivPtr)data;
@@ -1081,7 +1079,7 @@ SavageQueryBestSize(
short vid_w, short vid_h,
short drw_w, short drw_h,
unsigned int *p_w, unsigned int *p_h,
pointer data
void *data
){
/* What are the real limits for the Savage? */
@@ -1691,7 +1689,7 @@ SavagePutImage(
int id, unsigned char* buf,
short width, short height,
Bool sync,
RegionPtr clipBoxes, pointer data,
RegionPtr clipBoxes, void *data,
DrawablePtr pDraw
){
SavagePortPrivPtr pPriv = (SavagePortPrivPtr)data;
@@ -2022,7 +2020,7 @@ SavageAllocateSurface(
surface->id = id;
surface->pitches[0] = pitch;
surface->offsets[0] = offset; /*area->box.y1 * fbpitch;*/
surface->devPrivate.ptr = (pointer)pPriv;
surface->devPrivate.ptr = pPriv;
return Success;
}
@@ -2066,7 +2064,7 @@ SavageGetSurfaceAttribute(
INT32 *value
){
return SavageGetPortAttribute(pScrn, attribute, value,
(pointer)(GET_PORT_PRIVATE(pScrn)));
(GET_PORT_PRIVATE(pScrn)));
}
static int
@@ -2076,7 +2074,7 @@ SavageSetSurfaceAttribute(
INT32 value
){
return SavageSetPortAttribute(pScrn, attribute, value,
(pointer)(GET_PORT_PRIVATE(pScrn)));
(GET_PORT_PRIVATE(pScrn)));
}
static int