XLibre/xf86-video-tdfx
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-tdfx.git synced 2026-03-24 01:25:15 +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-07 17:40:20 +01:00
committed by Enrico Weigelt
parent f4adb62e1d
commit 26649c8bb3
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tdfx_dri.c
View File

@@ -45,7 +45,7 @@ TDFXDoWakeupHandler(ScreenPtr pScreen, int result)
}
static void
TDFXDoBlockHandler(ScreenPtr pScreen, pointer pTimeout)
TDFXDoBlockHandler(ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
@@ -131,7 +131,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->ddxDriverMajorVersion = TDFX_MAJOR_VERSION;
pDRIInfo->ddxDriverMinorVersion = TDFX_MINOR_VERSION;
pDRIInfo->ddxDriverPatchVersion = TDFX_PATCHLEVEL;
pDRIInfo->frameBufferPhysicalAddress = (pointer) pTDFX->LinearAddr[0];
pDRIInfo->frameBufferPhysicalAddress = pTDFX->LinearAddr[0];
pDRIInfo->frameBufferSize = pTDFX->FbMapSize;
pDRIInfo->frameBufferStride = pTDFX->stride;
pDRIInfo->ddxDrawableTableEntry = TDFX_MAX_DRAWABLES;

10
src/tdfx_driver.c
View File

@@ -124,7 +124,7 @@ static void TDFXFreeScreen(ScrnInfoPtr pScrn);
static ModeStatus TDFXValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode,
Bool verbose, int flags);
static void TDFXBlockHandler(ScreenPtr pScreen, pointer pTimeout);
static void TDFXBlockHandler(ScreenPtr pScreen, void *pTimeout);
/* Switch to various Display Power Management System levels */
static void TDFXDisplayPowerManagementSet(ScrnInfoPtr pScrn,
@@ -223,8 +223,8 @@ static XF86ModuleVersionInfo tdfxVersRec =
_X_EXPORT XF86ModuleData tdfxModuleData = {&tdfxVersRec, tdfxSetup, 0};
static pointer
tdfxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static void*
tdfxSetup(void *module, void *opts, int *errmaj, int *errmin)
{
static Bool setupDone = FALSE;
@@ -238,7 +238,7 @@ tdfxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
return (pointer)1;
return (void*)1;
} else {
if (errmaj) *errmaj = LDR_ONCEONLY;
return NULL;
@@ -2189,7 +2189,7 @@ TDFXSaveScreen(ScreenPtr pScreen, int mode)
}
static void
TDFXBlockHandler(ScreenPtr pScreen, pointer pTimeout)
TDFXBlockHandler(ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);

44
src/tdfx_video.c
View File

@@ -47,19 +47,19 @@ static FBLinearPtr TDFXAllocateMemoryLinear (ScrnInfoPtr pScrn, FBLinearPtr line
static void TDFXVideoTimerCallback(ScrnInfoPtr pScrn, Time time);
static XF86VideoAdaptorPtr TDFXSetupImageVideoTexture(ScreenPtr);
static int TDFXSetPortAttributeTexture(ScrnInfoPtr, Atom, INT32, pointer);
static int TDFXGetPortAttributeTexture(ScrnInfoPtr, Atom ,INT32 *, pointer);
static int TDFXPutImageTexture(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
static void TDFXStopVideoTexture(ScrnInfoPtr, pointer, Bool);
static int TDFXSetPortAttributeTexture(ScrnInfoPtr, Atom, INT32, void*);
static int TDFXGetPortAttributeTexture(ScrnInfoPtr, Atom ,INT32 *, void*);
static int TDFXPutImageTexture(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, void*, DrawablePtr);
static void TDFXStopVideoTexture(ScrnInfoPtr, void*, Bool);
static XF86VideoAdaptorPtr TDFXSetupImageVideoOverlay(ScreenPtr);
static int TDFXSetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, pointer);
static int TDFXGetPortAttributeOverlay(ScrnInfoPtr, Atom ,INT32 *, pointer);
static int TDFXPutImageOverlay(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
static void TDFXStopVideoOverlay(ScrnInfoPtr, pointer, Bool);
static int TDFXSetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, void*);
static int TDFXGetPortAttributeOverlay(ScrnInfoPtr, Atom ,INT32 *, void*);
static int TDFXPutImageOverlay(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, void*, DrawablePtr);
static void TDFXStopVideoOverlay(ScrnInfoPtr, void*, Bool);
static void TDFXResetVideoOverlay(ScrnInfoPtr);
static void TDFXQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer);
static void TDFXQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, void*);
static int TDFXQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *);
static void TDFXInitOffscreenImages(ScreenPtr);
@@ -189,7 +189,7 @@ TDFXAllocAdaptor(ScrnInfoPtr pScrn, int numberPorts)
}
adapt->pPortPrivates = (DevUnion*)(&pPriv[1]);
adapt->pPortPrivates[0].ptr = (pointer)pPriv;
adapt->pPortPrivates[0].ptr = pPriv;
xvColorKey = MAKE_ATOM("XV_COLORKEY");
xvFilterQuality = MAKE_ATOM("XV_FILTER_QUALITY");
@@ -341,7 +341,7 @@ TDFXSetPortAttributeOverlay(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 value,
pointer data
void* data
){
TDFXPortPrivPtr pPriv = (TDFXPortPrivPtr)data;
@@ -366,7 +366,7 @@ TDFXGetPortAttributeOverlay(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 *value,
pointer data
void *data
){
TDFXPortPrivPtr pPriv = (TDFXPortPrivPtr)data;
@@ -385,7 +385,7 @@ TDFXSetPortAttributeTexture(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 value,
pointer data
void *data
) {
return Success;
}
@@ -396,7 +396,7 @@ TDFXGetPortAttributeTexture(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 *value,
pointer data
void *data
){
return Success;
}
@@ -409,7 +409,7 @@ TDFXQueryBestSize(
short vid_w, short vid_h,
short drw_w, short drw_h,
unsigned int *p_w, unsigned int *p_h,
pointer data
void *data
){
if(vid_w > drw_w) drw_w = vid_w;
if(vid_h > drw_h) drw_h = vid_h;
@@ -504,7 +504,7 @@ TDFXCopyMungedData(
static void
TDFXStopVideoTexture(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
TDFXStopVideoTexture(ScrnInfoPtr pScrn, void *data, Bool cleanup)
{
TDFXPtr pTDFX = TDFXPTR(pScrn);
@@ -617,7 +617,7 @@ TDFXPutImageTexture(
int id, unsigned char* buf,
short width, short height,
Bool sync,
RegionPtr clipBoxes, pointer data,
RegionPtr clipBoxes, void *data,
DrawablePtr pDraw
)
{
@@ -700,7 +700,7 @@ TDFXResetVideoOverlay(ScrnInfoPtr pScrn)
static void
TDFXStopVideoOverlay(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
TDFXStopVideoOverlay(ScrnInfoPtr pScrn, void *data, Bool cleanup)
{
TDFXPtr pTDFX = TDFXPTR(pScrn);
TDFXPortPrivPtr pPriv = (TDFXPortPrivPtr)data;
@@ -841,7 +841,7 @@ TDFXPutImageOverlay(
int id, unsigned char* buf,
short width, short height,
Bool Sync,
RegionPtr clipBoxes, pointer data,
RegionPtr clipBoxes, void *data,
DrawablePtr pDraw
){
TDFXPtr pTDFX = TDFXPTR(pScrn);
@@ -1162,7 +1162,7 @@ TDFXAllocateSurface(
surface->id = id;
surface->pitches[0] = pitch;
surface->offsets[0] = pTDFX->fbOffset + (linear->offset * bpp);
surface->devPrivate.ptr = (pointer)pPriv;
surface->devPrivate.ptr = pPriv;
return Success;
}
@@ -1207,7 +1207,7 @@ TDFXGetSurfaceAttribute(
INT32 *value
){
return TDFXGetPortAttributeOverlay(pScrn, attribute, value,
(pointer)(GET_PORT_PRIVATE(pScrn)));
(GET_PORT_PRIVATE(pScrn)));
}
static int
@@ -1217,7 +1217,7 @@ TDFXSetSurfaceAttribute(
INT32 value
){
return TDFXSetPortAttributeOverlay(pScrn, attribute, value,
(pointer)(GET_PORT_PRIVATE(pScrn)));
(GET_PORT_PRIVATE(pScrn)));
}
static int