mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-10 16:51:33 +00:00
xfree86: drivers: cirrus: use void* instead pointer
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
f1eae16666
commit
8da5b8da1b
@@ -120,8 +120,7 @@ static XF86ModuleVersionInfo cirVersRec =
|
||||
*/
|
||||
_X_EXPORT XF86ModuleData cirrusModuleData = { &cirVersRec, cirSetup, NULL };
|
||||
|
||||
static pointer
|
||||
cirSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
static void* cirSetup(void *module, void *opts, int *errmaj, int *errmin)
|
||||
{
|
||||
static Bool setupDone = FALSE;
|
||||
|
||||
@@ -131,7 +130,7 @@ cirSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
setupDone = TRUE;
|
||||
xf86AddDriver(&CIRRUS, module, 0);
|
||||
|
||||
return (pointer)1;
|
||||
return (void*)1;
|
||||
}
|
||||
if (errmaj) *errmaj = LDR_ONCEONLY;
|
||||
return NULL;
|
||||
@@ -351,17 +350,17 @@ CirUnmapMem(CirPtr pCir, int scrnIndex)
|
||||
* Unmap IO registers to virtual address space
|
||||
*/
|
||||
#ifndef XSERVER_LIBPCIACCESS
|
||||
xf86UnMapVidMem(scrnIndex, (pointer)pCir->IOBase, pCir->IoMapSize);
|
||||
xf86UnMapVidMem(scrnIndex, pCir->IOBase, pCir->IoMapSize);
|
||||
#else
|
||||
pci_device_unmap_range(pCir->PciInfo, (pointer)pCir->IOBase, pCir->IoMapSize);
|
||||
pci_device_unmap_range(pCir->PciInfo, pCir->IOBase, pCir->IoMapSize);
|
||||
#endif
|
||||
pCir->IOBase = NULL;
|
||||
}
|
||||
|
||||
#ifndef XSERVER_LIBPCIACCESS
|
||||
xf86UnMapVidMem(scrnIndex, (pointer)pCir->FbBase, pCir->FbMapSize);
|
||||
xf86UnMapVidMem(scrnIndex, pCir->FbBase, pCir->FbMapSize);
|
||||
#else
|
||||
pci_device_unmap_range(pCir->PciInfo, (pointer)pCir->FbBase, pCir->FbMapSize);
|
||||
pci_device_unmap_range(pCir->PciInfo, pCir->FbBase, pCir->FbMapSize);
|
||||
#endif
|
||||
pCir->FbBase = NULL;
|
||||
return TRUE;
|
||||
|
||||
Reference in New Issue
Block a user