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

replace obsolete "pointer" 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 18:58:32 +01:00
committed by Enrico Weigelt
parent b5caa4d195
commit f1fdb72a31
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mga_driver.c
View File

@@ -117,7 +117,7 @@ static Bool MGAUnmapMem(ScrnInfoPtr pScrn);
static void MGASave(ScrnInfoPtr pScrn);
static void MGARestore(ScrnInfoPtr pScrn);
static Bool MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
static void MGABlockHandler(ScreenPtr arg, pointer pTimeout);
static void MGABlockHandler(ScreenPtr arg, void *pTimeout);
static void MGAG100BlackMagic(ScrnInfoPtr pScrn);
static int MGAEntityIndex = -1;
@@ -588,8 +588,8 @@ static XF86ModuleVersionInfo mgaVersRec =
_X_EXPORT XF86ModuleData MGA_MODULE_DATA = { &mgaVersRec, mgaSetup, NULL };
static pointer
mgaSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static void*
mgaSetup(void *module, void *opts, int *errmaj, int *errmin)
{
static Bool setupDone = FALSE;
@@ -602,7 +602,7 @@ mgaSetup(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;

34
src/mga_video.c
View File

@@ -30,19 +30,19 @@
static void MGAInitOffscreenImages(ScreenPtr);
static XF86VideoAdaptorPtr MGASetupImageVideoOverlay(ScreenPtr);
static int MGASetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, pointer);
static int MGAGetPortAttributeOverlay(ScrnInfoPtr, Atom ,INT32 *, pointer);
static int MGASetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, void*);
static int MGAGetPortAttributeOverlay(ScrnInfoPtr, Atom ,INT32 *, void*);
static XF86VideoAdaptorPtr MGASetupImageVideoTexture(ScreenPtr);
static int MGASetPortAttributeTexture(ScrnInfoPtr, Atom, INT32, pointer);
static int MGAGetPortAttributeTexture(ScrnInfoPtr, Atom ,INT32 *, pointer);
static int MGASetPortAttributeTexture(ScrnInfoPtr, Atom, INT32, void*);
static int MGAGetPortAttributeTexture(ScrnInfoPtr, Atom ,INT32 *, void*);
static void MGAStopVideo(ScrnInfoPtr, pointer, Bool);
static void MGAStopVideo(ScrnInfoPtr, void*, Bool);
static void MGAQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short,
unsigned int *, unsigned int *, pointer);
unsigned int *, unsigned int *, void*);
static int MGAPutImage(ScrnInfoPtr, short, short, short, short, short,
short, short, short, int, unsigned char*, short,
short, Bool, RegionPtr, pointer, DrawablePtr);
short, Bool, RegionPtr, void*, DrawablePtr);
static int MGAQueryImageAttributes(ScrnInfoPtr, int, unsigned short *,
unsigned short *, int *, int *);
static void MGAFreeMemory(ScrnInfoPtr pScrn, void *mem_struct);
@@ -54,7 +54,7 @@ static void MGAVideoTimerCallback(ScrnInfoPtr pScrn, Time time);
static XF86VideoAdaptorPtr MGASetupImageVideoILOAD(ScreenPtr);
static int MGAPutImageILOAD(ScrnInfoPtr, short, short, short, short, short,
short, short, short, int, unsigned char*, short,
short, Bool, RegionPtr, pointer, DrawablePtr);
short, Bool, RegionPtr, void*, DrawablePtr);
#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
@@ -344,7 +344,7 @@ MGASetupImageVideoTexture(ScreenPtr pScreen)
static void
MGAStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
MGAStopVideo(ScrnInfoPtr pScrn, void *data, Bool shutdown)
{
MGAPtr pMga = MGAPTR(pScrn);
MGAPortPrivPtr pPriv = pMga->portPrivate;
@@ -374,7 +374,7 @@ MGASetPortAttributeOverlay(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 value,
pointer data
void *data
){
MGAPtr pMga = MGAPTR(pScrn);
MGAPortPrivPtr pPriv = pMga->portPrivate;
@@ -419,7 +419,7 @@ MGAGetPortAttributeOverlay(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 *value,
pointer data
void *data
){
MGAPtr pMga = MGAPTR(pScrn);
MGAPortPrivPtr pPriv = pMga->portPrivate;
@@ -446,7 +446,7 @@ MGASetPortAttributeTexture(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 value,
pointer data
void *data
) {
return BadMatch;
}
@@ -457,7 +457,7 @@ MGAGetPortAttributeTexture(
ScrnInfoPtr pScrn,
Atom attribute,
INT32 *value,
pointer data
void *data
){
return BadMatch;
}
@@ -469,7 +469,7 @@ MGAQueryBestSize(
short vid_w, short vid_h,
short drw_w, short drw_h,
unsigned int *p_w, unsigned int *p_h,
pointer data
void *data
){
*p_w = drw_w;
*p_h = drw_h;
@@ -782,7 +782,7 @@ MGAPutImage(
int id, unsigned char* buf,
short width, short height,
Bool Sync,
RegionPtr clipBoxes, pointer data,
RegionPtr clipBoxes, void *data,
DrawablePtr pDraw
){
MGAPtr pMga = MGAPTR(pScrn);
@@ -1044,7 +1044,7 @@ MGAAllocateSurface(
surface->id = id;
surface->pitches[0] = pitch;
surface->offsets[0] = offset;
surface->devPrivate.ptr = (pointer)pPriv;
surface->devPrivate.ptr = (void*)pPriv;
return Success;
}
@@ -1915,7 +1915,7 @@ MGAPutImageILOAD(
int id, unsigned char* buf,
short width, short height,
Bool Sync,
RegionPtr clipBoxes, pointer data,
RegionPtr clipBoxes, void *data,
DrawablePtr pDraw
){
MGAPtr pMga = MGAPTR(pScrn);