From c81b601dfaa2fcd9c52baa9f331237e6bcf00115 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Sat, 3 Jan 2026 14:13:54 +0100 Subject: [PATCH] replace obsolete "pointer" typedef by void* Signed-off-by: Enrico Weigelt, metux IT consult --- src/apm.h | 8 ++++---- src/apm_driver.c | 12 ++++++------ src/apm_video.c | 26 +++++++++++++------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/apm.h b/src/apm.h index 475b0b8..b303e74 100644 --- a/src/apm.h +++ b/src/apm.h @@ -91,18 +91,18 @@ typedef struct { CARD32 LinAddress; unsigned long LinMapSize; CARD32 FbMapSize; - pointer LinMap; - pointer FbBase; + void* LinMap; + void* FbBase; char *VGAMap; char *MemMap; - pointer BltMap; + void* BltMap; Bool UnlockCalled; unsigned long iobase, xport, xbase; unsigned char savedSR10; CARD8 MiscOut; CARD8 c9, d9, db, Rush; unsigned int saveCmd; - pointer FontInfo; + void* FontInfo; Bool hwCursor; ApmRegStr ModeReg, SavedReg; CloseScreenProcPtr CloseScreen; diff --git a/src/apm_driver.c b/src/apm_driver.c index 003cf65..bb7fb46 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -142,8 +142,8 @@ static MODULESETUPPROTO(apmSetup); */ _X_EXPORT XF86ModuleData apmModuleData = { &apmVersRec, apmSetup, NULL }; -static pointer -apmSetup(pointer module, pointer opts, int *errmaj, int *errmain) +static void* +apmSetup(void* module, void *opts, int *errmaj, int *errmain) { static Bool setupDone = FALSE; @@ -151,7 +151,7 @@ apmSetup(pointer module, pointer opts, int *errmaj, int *errmain) setupDone = TRUE; xf86AddDriver(&APM, module, 0); - return (pointer)1; + return (void*)1; } else { if (errmaj) *errmaj = LDR_ONCEONLY; @@ -705,7 +705,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) LinMap[0xFFECDB] = db; LinMap[0xFFECD9] = d9; /*pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save);*/ - pci_device_unmap_range(pApm->PciInfo, (pointer)LinMap, pApm->LinMapSize); + pci_device_unmap_range(pApm->PciInfo, (void*)LinMap, pApm->LinMapSize); from = X_PROBED; } else { @@ -1067,11 +1067,11 @@ ApmUnmapMem(ScrnInfoPtr pScrn) WRXB(0xDB, pApm->db); } WRXB(0xC9, pApm->c9); - pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, pApm->LinMapSize); + pci_device_unmap_range(pApm->PciInfo, (void*)pApm->LinMap, pApm->LinMapSize); pApm->LinMap = NULL; } else if (pApm->FbBase) - pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, 0x10000); + pci_device_unmap_range(pApm->PciInfo, (void*)pApm->LinMap, 0x10000); return TRUE; } diff --git a/src/apm_video.c b/src/apm_video.c index ea983b6..d7e9a7d 100644 --- a/src/apm_video.c +++ b/src/apm_video.c @@ -14,18 +14,18 @@ static XF86VideoAdaptorPtr A(SetupImageVideo)(ScreenPtr); -static void A(StopVideo)(ScrnInfoPtr, pointer, Bool); -static int A(SetPortAttribute)(ScrnInfoPtr, Atom, INT32, pointer); -static int ApmGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer); +static void A(StopVideo)(ScrnInfoPtr, void*, Bool); +static int A(SetPortAttribute)(ScrnInfoPtr, Atom, INT32, void*); +static int ApmGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, void*); static void ApmQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, - pointer); + void*); static int ApmQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *); static int A(PutImage)(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, - short, short, Bool, RegionPtr, pointer, + short, short, Bool, RegionPtr, void*, DrawablePtr); static void A(ResetVideo)(ScrnInfoPtr); @@ -313,8 +313,8 @@ A(SetupImageVideo)(ScreenPtr pScreen) pPriv[1].pApm = pApm; pPriv->reg = 0x82; pPriv[1].reg = 0x92; - adapt->pPortPrivates[0].ptr = (pointer)(pPriv); - adapt->pPortPrivates[1].ptr = (pointer)(pPriv + 1); + adapt->pPortPrivates[0].ptr = (void*)(pPriv); + adapt->pPortPrivates[1].ptr = (void*)(pPriv + 1); adapt->nAttributes = NUM_ATTRIBUTES; adapt->pAttributes = Attributes; adapt->nImages = NUM_IMAGES; @@ -412,7 +412,7 @@ ApmClipVideo(BoxPtr dst, INT32 *x1, INT32 *x2, INT32 *y1, INT32 *y2, } static void -A(StopVideo)(ScrnInfoPtr pScrn, pointer data, Bool shutdown) +A(StopVideo)(ScrnInfoPtr pScrn, void *data, Bool shutdown) { ApmPortPrivPtr pPriv = (ApmPortPrivPtr)data; APMDECL(pScrn); @@ -426,7 +426,7 @@ A(StopVideo)(ScrnInfoPtr pScrn, pointer data, Bool shutdown) static int A(SetPortAttribute)(ScrnInfoPtr pScrn, Atom attribute, INT32 value, - pointer data) + void* data) { ApmPortPrivPtr pPriv = (ApmPortPrivPtr)data; /*APMDECL(pScrn);*/ @@ -448,7 +448,7 @@ A(SetPortAttribute)(ScrnInfoPtr pScrn, Atom attribute, INT32 value, static int ApmGetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 *value, - pointer data) + void *data) { ApmPortPrivPtr pPriv = (ApmPortPrivPtr)data; @@ -465,7 +465,7 @@ ApmGetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 *value, static void ApmQueryBestSize(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) { APMDECL(pScrn); unsigned short round = ~pApm->CurrentLayout.mask32; @@ -498,7 +498,7 @@ static void A(XvRemoveCB)(FBAreaPtr area) static int A(ReputImage)(ScrnInfoPtr pScrn, short drw_x, short drw_y, - RegionPtr clipBoxes, pointer pdata, DrawablePtr pDraw) + RegionPtr clipBoxes, void *pdata, DrawablePtr pDraw) { ScreenPtr pScreen = pScrn->pScreen; APMDECL(pScrn); @@ -648,7 +648,7 @@ A(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 pDraw) + void *data, DrawablePtr pDraw) { ApmPortPrivPtr pPriv = (ApmPortPrivPtr)data; ScreenPtr pScreen = pScrn->pScreen;