summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-01-26 18:03:16 -0500
committerMatt Turner <mattst88@gmail.com>2012-01-26 18:03:40 -0500
commitc2667fb882429f9393b0700a2befe6dde4523f02 (patch)
treeffcd52ee911d3f7c8b168176fc50ad611e5dc5c3
parent99ed41779e28bace7c3321a6d05e6436d4784c48 (diff)
Change types of FBBase/MMIOBase to pointer, remove casts
Signed-off-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/ark.h4
-rw-r--r--src/ark_driver.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ark.h b/src/ark.h
index f1bdb35..7462876 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -39,8 +39,8 @@ typedef struct _ARKRec {
#endif
EntityInfoPtr pEnt;
CARD32 IOAddress;
- unsigned char * FBBase;
- unsigned char * MMIOBase;
+ pointer FBBase;
+ pointer MMIOBase;
unsigned long videoRam;
OptionInfoPtr Options;
unsigned int Flags;
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 1f4589c..cda8cdc 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1037,10 +1037,10 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
(void) pci_device_map_legacy(pARK->PciInfo, 0xb8000, 0x8000,
PCI_DEV_MAP_FLAG_WRITABLE,
- (void **)&pARK->MMIOBase);
+ &pARK->MMIOBase);
{
- void** result = (void**)&pARK->FBBase;
+ void** result = &pARK->FBBase;
int err = pci_device_map_range(pARK->PciInfo,
pARK->PciInfo->regions[0].base_addr,
pScrn->videoRam * 1024,
@@ -1074,7 +1074,7 @@ static void ARKUnmapMem(ScrnInfoPtr pScrn)
vgaHWUnmapMem(pScrn);
#ifndef XSERVER_LIBPCIACCESS
- xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pARK->FBBase,
+ xf86UnMapVidMem(pScrn->scrnIndex, pARK->FBBase,
pScrn->videoRam * 1024);
#else
pci_device_unmap_range(pARK->PciInfo, pARK->FBBase, pScrn->videoRam * 1024);