diff options
| author | Stefan Dirsch <sndirsch@novell.com> | 2011-11-01 19:39:45 +0100 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-11-01 13:35:42 -0700 |
| commit | 3b24a2eef9b1069b3a570373fa9e2d3259a843fe (patch) | |
| tree | e220eabde198cdda08fcda56c9fd5b489f7a2f46 | |
| parent | b9db7661e6c47ec569dc7fd986147cc5b5b4c3a5 (diff) | |
Fix some serious compiler warnings.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rwxr-xr-x | src/xgi_accel.c | 1 | ||||
| -rwxr-xr-x | src/xgi_dri.c | 2 | ||||
| -rwxr-xr-x | src/xgi_driver.c | 2 | ||||
| -rwxr-xr-x | src/xgi_setup.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/xgi_accel.c b/src/xgi_accel.c index 4c298ed..5a6f91d 100755 --- a/src/xgi_accel.c +++ b/src/xgi_accel.c @@ -945,6 +945,7 @@ Volari_AccelInit(ScreenPtr pScreen) return TRUE; } #endif /* EXA */ + return TRUE; } void diff --git a/src/xgi_dri.c b/src/xgi_dri.c index e575c19..6ad83ca 100755 --- a/src/xgi_dri.c +++ b/src/xgi_dri.c @@ -285,7 +285,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen) pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR; pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR; pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL; - pDRIInfo->frameBufferPhysicalAddress = pXGI->FbAddress; + pDRIInfo->frameBufferPhysicalAddress = (pointer) pXGI->FbAddress; pDRIInfo->frameBufferSize = pXGI->FbMapSize; /* ?? */ diff --git a/src/xgi_driver.c b/src/xgi_driver.c index 3c12fd5..e0e486b 100755 --- a/src/xgi_driver.c +++ b/src/xgi_driver.c @@ -3050,7 +3050,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) ); #endif - pXGI->xgi_HwDevExt.pjIOAddress = (XGIIOADDRESS) (pXGI->RelIO + 0x30); + pXGI->xgi_HwDevExt.pjIOAddress = (pointer)((XGIIOADDRESS) (pXGI->RelIO + 0x30)); xf86DrvMsg(pScrn->scrnIndex, from, "Relocated IO registers at 0x%lX\n", (unsigned long) pXGI->RelIO); ErrorF("xgi_driver.c-pXGI->xgi_HwDevExt.pjIOAddress=0x%x...\n", pXGI->xgi_HwDevExt.pjIOAddress); diff --git a/src/xgi_setup.c b/src/xgi_setup.c index 6641b09..a4514ad 100755 --- a/src/xgi_setup.c +++ b/src/xgi_setup.c @@ -587,7 +587,7 @@ XGI_InitHwDevInfo(ScrnInfoPtr pScrn) PDEBUG(ErrorF("pXGI->FbBase = 0x%08lx\n",(ULONG)(pXGI->FbBase))) ; PDEBUG(ErrorF("pHwDevInfo->pjVideoMemoryAddress = 0x%08lx\n",(ULONG)(pHwDevInfo->pjVideoMemoryAddress))) ; pHwDevInfo->ulVideoMemorySize = pXGI->FbMapSize ; - pHwDevInfo->pjIOAddress = pXGI->RelIO + 0x30 ; + pHwDevInfo->pjIOAddress = (pointer)(pXGI->RelIO + 0x30); switch (pXGI->Chipset) { case PCI_CHIP_XGIXG40: |