XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +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 19:43:08 +01:00
committed by Enrico Weigelt
parent 1e229f648f
commit fbdc895c2e
6 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/g80_driver.c
View File

@@ -465,7 +465,7 @@ G80CloseScreen(ScreenPtr pScreen)
}
static void
G80BlockHandler(ScreenPtr pScreen, pointer pTimeout)
G80BlockHandler(ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrnInfo = xf86ScreenToScrn(pScreen);
G80Ptr pNv = G80PTR(pScrnInfo);

2
src/g80_sor.c
View File

@@ -312,7 +312,7 @@ G80SorCreateResources(xf86OutputPtr output)
s = "aspect";
err = RRChangeOutputProperty(output->randr_output, properties.scale.atom,
XA_STRING, 8, PropModeReplace, strlen(s),
(pointer)s, FALSE, FALSE);
s, FALSE, FALSE);
if(err)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Failed to set scaling property for %s: error %d\n",

13
src/nv_driver.c
View File

@@ -65,8 +65,7 @@ static void NVFreeScreen(ScrnInfoPtr pScrn);
static ModeStatus NVValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode,
Bool verbose, int flags);
#ifdef RANDR
static Bool NVDriverFunc(ScrnInfoPtr pScrnInfo, xorgDriverFuncOp op,
pointer data);
static Bool NVDriverFunc(ScrnInfoPtr pScrnInfo, xorgDriverFuncOp op, void *data);
#endif
/* Internally used functions */
@@ -694,8 +693,8 @@ NVFreeRec(ScrnInfoPtr pScrn)
pScrn->driverPrivate = NULL;
}
static pointer
nvSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static void *
nvSetup(void *module, void *opts, int *errmaj, int *errmin)
{
static Bool setupDone = FALSE;
@@ -711,7 +710,7 @@ nvSetup(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;
@@ -1026,7 +1025,7 @@ NVLeaveVTVBE(ScrnInfoPtr pScrn)
}
static void
NVBlockHandler (ScreenPtr pScreen, pointer pTimeout)
NVBlockHandler (ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrnInfo = xf86ScreenToScrn(pScreen);
NVPtr pNv = NVPTR(pScrnInfo);
@@ -2613,7 +2612,7 @@ NVRandRSetConfig(ScrnInfoPtr pScrn, xorgRRConfig *config)
}
static Bool
NVDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer data)
NVDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, void *data)
{
switch(op) {
case RR_GET_INFO:

12
src/nv_local.h
View File

@@ -43,12 +43,12 @@ typedef unsigned int U032;
/*
* HW access macros. These assume memory-mapped I/O, and not normal I/O space.
*/
#define NV_WR08(p,i,d) MMIO_OUT8((pointer)(p), (i), (d))
#define NV_RD08(p,i) MMIO_IN8((pointer)(p), (i))
#define NV_WR16(p,i,d) MMIO_OUT16((pointer)(p), (i), (d))
#define NV_RD16(p,i) MMIO_IN16((pointer)(p), (i))
#define NV_WR32(p,i,d) MMIO_OUT32((pointer)(p), (i), (d))
#define NV_RD32(p,i) MMIO_IN32((pointer)(p), (i))
#define NV_WR08(p,i,d) MMIO_OUT8((void*)(p), (i), (d))
#define NV_RD08(p,i) MMIO_IN8((void*)(p), (i))
#define NV_WR16(p,i,d) MMIO_OUT16((void*)(p), (i), (d))
#define NV_RD16(p,i) MMIO_IN16((void*)(p), (i))
#define NV_WR32(p,i,d) MMIO_OUT32((void*)(p), (i), (d))
#define NV_RD32(p,i) MMIO_IN32((void*)(p), (i))
/* VGA I/O is now always done through MMIO */
#define VGA_WR08(p,i,d) NV_WR08(p,i,d)

42
src/nv_video.c
View File

@@ -64,18 +64,18 @@ static void NVPutOverlayImage(ScrnInfoPtr pScrnInfo,
short dst_w, short dst_h,
RegionPtr cliplist);
static int NVSetOverlayPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
static int NVGetOverlayPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
static int NVSetBlitPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
static int NVGetBlitPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
static int NVSetOverlayPortAttribute(ScrnInfoPtr, Atom, INT32, void*);
static int NVGetOverlayPortAttribute(ScrnInfoPtr, Atom ,INT32 *, void*);
static int NVSetBlitPortAttribute(ScrnInfoPtr, Atom, INT32, void*);
static int NVGetBlitPortAttribute(ScrnInfoPtr, Atom ,INT32 *, void*);
static void NVStopOverlayVideo(ScrnInfoPtr, pointer, Bool);
static void NVStopBlitVideo(ScrnInfoPtr, pointer, Bool);
static void NVStopOverlayVideo(ScrnInfoPtr, void*, Bool);
static void NVStopBlitVideo(ScrnInfoPtr, void*, Bool);
static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, void*, DrawablePtr);
static void NVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer);
static void NVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, void*);
static int NVQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *);
static void NVVideoTimerCallback(ScrnInfoPtr, Time);
@@ -364,7 +364,7 @@ NVSetupBlitVideo (ScreenPtr pScreen)
pPriv = (NVPortPrivPtr)(&adapt->pPortPrivates[NUM_BLIT_PORTS]);
for(i = 0; i < NUM_BLIT_PORTS; i++)
adapt->pPortPrivates[i].ptr = (pointer)(pPriv);
adapt->pPortPrivates[i].ptr = pPriv;
if(pNv->WaitVSyncPossible) {
adapt->pAttributes = NVBlitAttributes;
@@ -424,7 +424,7 @@ NVSetupOverlayVideo (ScreenPtr pScreen)
adapt->nPorts = 1;
adapt->pPortPrivates = (DevUnion*)(&adapt[1]);
pPriv = (NVPortPrivPtr)(&adapt->pPortPrivates[1]);
adapt->pPortPrivates[0].ptr = (pointer)(pPriv);
adapt->pPortPrivates[0].ptr = pPriv;
adapt->pAttributes = NVOverlayAttributes;
adapt->nAttributes = NUM_OVERLAY_ATTRIBUTES;
adapt->pImages = NVImages;
@@ -638,7 +638,7 @@ NVPutBlitImage (
static void NVStopOverlayVideo
(
ScrnInfoPtr pScrnInfo,
pointer data,
void *data,
Bool Exit
)
{
@@ -666,7 +666,7 @@ static void NVStopOverlayVideo
static void NVStopBlitVideo
(
ScrnInfoPtr pScrnInfo,
pointer data,
void *data,
Bool Exit
)
{
@@ -677,7 +677,7 @@ static int NVSetOverlayPortAttribute
ScrnInfoPtr pScrnInfo,
Atom attribute,
INT32 value,
pointer data
void *data
)
{
NVPortPrivPtr pPriv = (NVPortPrivPtr)data;
@@ -747,7 +747,7 @@ static int NVGetOverlayPortAttribute
ScrnInfoPtr pScrnInfo,
Atom attribute,
INT32 *value,
pointer data
void *data
)
{
NVPortPrivPtr pPriv = (NVPortPrivPtr)data;
@@ -779,7 +779,7 @@ static int NVSetBlitPortAttribute
ScrnInfoPtr pScrnInfo,
Atom attribute,
INT32 value,
pointer data
void *data
)
{
NVPortPrivPtr pPriv = (NVPortPrivPtr)data;
@@ -803,7 +803,7 @@ static int NVGetBlitPortAttribute
ScrnInfoPtr pScrnInfo,
Atom attribute,
INT32 *value,
pointer data
void *data
)
{
NVPortPrivPtr pPriv = (NVPortPrivPtr)data;
@@ -830,7 +830,7 @@ static void NVQueryBestSize
short drw_h,
unsigned int *p_w,
unsigned int *p_h,
pointer data
void *data
)
{
if(vid_w > (drw_w << 3))
@@ -996,7 +996,7 @@ static int NVPutImage
short height,
Bool Sync,
RegionPtr clipBoxes,
pointer data,
void *data,
DrawablePtr pDraw
)
{
@@ -1349,7 +1349,7 @@ NVAllocSurface (
surface->pScrn = pScrnInfo;
surface->pitches = &pPriv->pitch;
surface->offsets = &pPriv->offset;
surface->devPrivate.ptr = (pointer)pPriv;
surface->devPrivate.ptr = pPriv;
surface->id = id;
/* grab the video */
@@ -1398,7 +1398,7 @@ NVGetSurfaceAttribute (
NVPtr pNv = NVPTR(pScrnInfo);
NVPortPrivPtr pPriv = GET_OVERLAY_PRIVATE(pNv);
return NVGetOverlayPortAttribute(pScrnInfo, attribute, value, (pointer)pPriv);
return NVGetOverlayPortAttribute(pScrnInfo, attribute, value, pPriv);
}
static int
@@ -1411,7 +1411,7 @@ NVSetSurfaceAttribute(
NVPtr pNv = NVPTR(pScrnInfo);
NVPortPrivPtr pPriv = GET_OVERLAY_PRIVATE(pNv);
return NVSetOverlayPortAttribute(pScrnInfo, attribute, value, (pointer)pPriv);
return NVSetOverlayPortAttribute(pScrnInfo, attribute, value, pPriv);
}
static int

12
src/riva_local.h
View File

@@ -42,12 +42,12 @@ typedef unsigned int U032;
/*
* HW access macros. These assume memory-mapped I/O, and not normal I/O space.
*/
#define RIVA_WR08(p,i,d) MMIO_OUT8((pointer)(p), (i), (d))
#define RIVA_RD08(p,i) MMIO_IN8((pointer)(p), (i))
#define RIVA_WR16(p,i,d) MMIO_OUT16((pointer)(p), (i), (d))
#define RIVA_RD16(p,i) MMIO_IN16((pointer)(p), (i))
#define RIVA_WR32(p,i,d) MMIO_OUT32((pointer)(p), (i), (d))
#define RIVA_RD32(p,i) MMIO_IN32((pointer)(p), (i))
#define RIVA_WR08(p,i,d) MMIO_OUT8((void*)(p), (i), (d))
#define RIVA_RD08(p,i) MMIO_IN8((void*)(p), (i))
#define RIVA_WR16(p,i,d) MMIO_OUT16((void*)(p), (i), (d))
#define RIVA_RD16(p,i) MMIO_IN16((void*)(p), (i))
#define RIVA_WR32(p,i,d) MMIO_OUT32((void*)(p), (i), (d))
#define RIVA_RD32(p,i) MMIO_IN32((void*)(p), (i))
/* VGA I/O is now always done through MMIO */
#define VGA_WR08(p,i,d) RIVA_WR08(p,i,d)