XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-05 17:42:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfree86: drivers: apm: use void* instead pointer

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-22 18:47:03 +02:00
committed by Enrico Weigelt
parent cdf12d4c2e
commit b545ea7d84
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/drivers/video/apm/src/apm.h
View File

@@ -94,18 +94,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;

17
hw/xfree86/drivers/video/apm/src/apm_driver.c
View File

@@ -154,8 +154,7 @@ 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;
@@ -163,7 +162,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;
@@ -747,9 +746,9 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
LinMap[0xFFECD9] = d9;
/*pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save);*/
#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)LinMap, pApm->LinMapSize);
xf86UnMapVidMem(pScrn->scrnIndex, LinMap, pApm->LinMapSize);
#else
pci_device_unmap_range(pApm->PciInfo, (pointer)LinMap, pApm->LinMapSize);
pci_device_unmap_range(pApm->PciInfo, LinMap, pApm->LinMapSize);
#endif
from = X_PROBED;
}
@@ -1120,17 +1119,17 @@ ApmUnmapMem(ScrnInfoPtr pScrn)
}
WRXB(0xC9, pApm->c9);
#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, pApm->LinMapSize);
xf86UnMapVidMem(pScrn->scrnIndex, pApm->LinMap, pApm->LinMapSize);
#else
pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, pApm->LinMapSize);
pci_device_unmap_range(pApm->PciInfo, pApm->LinMap, pApm->LinMapSize);
#endif
pApm->LinMap = NULL;
}
else if (pApm->FbBase)
#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, 0x10000);
xf86UnMapVidMem(pScrn->scrnIndex, pApm->LinMap, 0x10000);
#else
pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, 0x10000);
pci_device_unmap_range(pApm->PciInfo, pApm->LinMap, 0x10000);
#endif
return TRUE;