XLibre/xf86-video-siliconmotion
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-siliconmotion.git synced 2026-03-23 17:19:38 +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:10:49 +01:00
committed by Enrico Weigelt
parent c382d68230
commit 27d864d830
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/smi.h
View File

@@ -267,7 +267,7 @@ typedef struct
Bool interlaced; /* True: Interlaced Video */
XF86VideoAdaptorPtr ptrAdaptor; /* Pointer to VideoAdapter
structure */
void (*BlockHandler)(ScreenPtr pScreen, pointer pTimeout);
void (*BlockHandler)(ScreenPtr pScreen, void *pTimeout);
#if SMI501_CLI_DEBUG
/* SMI 501/502 Command List Interpreter */
Bool batch_active;

10
src/smi_driver.c
View File

@@ -211,8 +211,8 @@ _X_EXPORT XF86ModuleData siliconmotionModuleData =
NULL
};
static pointer
siliconmotionSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static void*
siliconmotionSetup(void *module, void *opts, int *errmaj, int *errmin)
{
static Bool setupDone = FALSE;
@@ -224,7 +224,7 @@ siliconmotionSetup(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) {
@@ -1522,13 +1522,13 @@ SMI_UnmapMem(ScrnInfoPtr pScrn)
SMI_DisableMmio(pScrn);
if (pSmi->MapBase) {
pci_device_unmap_range(pSmi->PciInfo, (pointer)pSmi->MapBase,
pci_device_unmap_range(pSmi->PciInfo, pSmi->MapBase,
pSmi->MapSize);
pSmi->MapBase = NULL;
}
if (pSmi->FBBase) {
pci_device_unmap_range(pSmi->PciInfo, (pointer)pSmi->FBBase,
pci_device_unmap_range(pSmi->PciInfo, pSmi->FBBase,
pSmi->videoRAMBytes);
pSmi->FBBase = NULL;
}

36
src/smi_video.c
View File

@@ -86,21 +86,21 @@ static void SMI_ResetVideo(ScrnInfoPtr pScrn);
static int SMI_PutVideo(ScrnInfoPtr pScrn,
short vid_x, short vid_y, short drw_x, short drw_y,
short vid_w, short vid_h, short drw_w, short drw_h,
RegionPtr clipBoxes, pointer data, DrawablePtr);
RegionPtr clipBoxes, void *data, DrawablePtr);
#endif
static void SMI_StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown);
static void SMI_StopVideo(ScrnInfoPtr pScrn, void *data, Bool shutdown);
static int SMI_SetPortAttribute(ScrnInfoPtr pScrn, Atom attribute,
INT32 value, pointer data);
INT32 value, void *data);
static int SMI_GetPortAttribute(ScrnInfoPtr pScrn, Atom attribute,
INT32 *value, pointer data);
INT32 *value, void *data);
static void SMI_QueryBestSize(ScrnInfoPtr pScrn, Bool motion,
short vid_w, short vid_h, short drw_w, short drw_h,
unsigned int *p_w, unsigned int *p_h, pointer data);
unsigned int *p_w, unsigned int *p_h, void *data);
static int SMI_PutImage(ScrnInfoPtr pScrn,
short src_x, short src_y, short drw_x, short drw_y,
short src_w, short src_h, short drw_w, short drw_h,
int id, unsigned char *buf, short width, short height, Bool sync,
RegionPtr clipBoxes, pointer data, DrawablePtr);
RegionPtr clipBoxes, void *data, DrawablePtr);
static int SMI_QueryImageAttributes(ScrnInfoPtr pScrn,
int id, unsigned short *width, unsigned short *height,
int *picthes, int *offsets);
@@ -122,7 +122,7 @@ static void SMI_DisplayVideo0501(ScrnInfoPtr pScrn, int id, int offset,
static void SMI_DisplayVideo0730(ScrnInfoPtr pScrn, int id, int offset,
short width, short height, int pitch, int x1, int y1, int x2, int y2,
BoxPtr dstBox, short vid_w, short vid_h, short drw_w, short drw_h);
static void SMI_BlockHandler(ScreenPtr pScreen, pointer pTimeout);
static void SMI_BlockHandler(ScreenPtr pScreen, void *pTimeout);
static void SMI_InitOffscreenImages(ScreenPtr pScreen);
static void SMI_VideoSave(ScreenPtr pScreen, ExaOffscreenArea *area);
@@ -799,7 +799,7 @@ SMI_SetupVideo(ScreenPtr pScreen)
ptrAdaptor->nPorts = 1;
ptrAdaptor->pPortPrivates = (DevUnion*) &ptrAdaptor[1];
ptrAdaptor->pPortPrivates[0].ptr = (pointer) &ptrAdaptor->pPortPrivates[1];
ptrAdaptor->pPortPrivates[0].ptr = &ptrAdaptor->pPortPrivates[1];
smiPortPtr = (SMI_PortPtr) ptrAdaptor->pPortPrivates[0].ptr;
@@ -940,7 +940,7 @@ SMI_PutVideo(
short drw_w,
short drw_h,
RegionPtr clipBoxes,
pointer data,
void* data,
DrawablePtr pDraw
)
{
@@ -1243,7 +1243,7 @@ SMI_PutVideo(
static void
SMI_StopVideo(
ScrnInfoPtr pScrn,
pointer data,
void* data,
Bool shutdown
)
{
@@ -1290,7 +1290,7 @@ SMI_SetPortAttribute(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 value,
pointer data
void* data
)
{
int res;
@@ -1347,7 +1347,7 @@ SMI_GetPortAttribute(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 *value,
pointer data
void* data
)
{
SMI_PortPtr pPort = (SMI_PortPtr) data;
@@ -1384,7 +1384,7 @@ SMI_QueryBestSize(
short drw_h,
unsigned int *p_w,
unsigned int *p_h,
pointer data
void* data
)
{
SMIPtr pSmi = SMIPTR(pScrn);
@@ -1415,7 +1415,7 @@ SMI_PutImage(
short height,
Bool sync,
RegionPtr clipBoxes,
pointer data,
void* data,
DrawablePtr pDraw
)
{
@@ -1996,7 +1996,7 @@ SMI_DisplayVideo0730(
}
static void
SMI_BlockHandler(ScreenPtr pScreen, pointer pTimeout)
SMI_BlockHandler(ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
SMIPtr pSmi = SMIPTR(pScrn);
@@ -2287,7 +2287,7 @@ SMI_AllocSurface(
surface->height = height;
surface->pitches[0] = pitch;
surface->offsets[0] = offset;
surface->devPrivate.ptr = (pointer) ptrOffscreen;
surface->devPrivate.ptr = ptrOffscreen;
ptrOffscreen->surface_memory = surface_memory;
ptrOffscreen->isOn = FALSE;
@@ -2428,7 +2428,7 @@ SMI_GetSurfaceAttribute(
SMIPtr pSmi = SMIPTR(pScrn);
return SMI_GetPortAttribute(pScrn, attr, value,
(pointer) pSmi->ptrAdaptor->pPortPrivates[0].ptr);
pSmi->ptrAdaptor->pPortPrivates[0].ptr);
}
static int
@@ -2441,7 +2441,7 @@ SMI_SetSurfaceAttribute(
SMIPtr pSmi = SMIPTR(pScrn);
return SMI_SetPortAttribute(pScrn, attr, value,
(pointer) pSmi->ptrAdaptor->pPortPrivates[0].ptr);
pSmi->ptrAdaptor->pPortPrivates[0].ptr);
}
static void