Use unsigned long rather than deprecated IOADDRESS

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston
2011-10-30 11:28:27 -07:00
parent 2fe2684818
commit b9db7661e6
3 changed files with 3 additions and 3 deletions

View File

@@ -131,7 +131,7 @@ typedef unsigned long XGIIOADDRESS;
#endif
#ifdef LINUX_XF86
typedef IOADDRESS XGIIOADDRESS;
typedef unsigned long XGIIOADDRESS;
#endif
#ifndef VBIOS_VER_MAX_LENGTH

View File

@@ -623,7 +623,7 @@ typedef struct {
unsigned char * FbBase; /* VRAM virtual linear address */
CARD32 IOAddress; /* MMIO physical address */
unsigned char * IOBase; /* MMIO linear address */
IOADDRESS IODBase; /* Base of PIO memory area */
unsigned long IODBase; /* Base of PIO memory area */
#ifdef __alpha__
unsigned char * IOBaseDense; /* MMIO for Alpha platform */
#endif

View File

@@ -3038,7 +3038,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
/* Get our relocated IO registers */
#if defined(__arm__)
pXGI->RelIO = (XGIIOADDRESS)(((IOADDRESS)VGAHWPTR(pScrn)->Base & 0xFFFFFFFC) + pXGI->IODBase);
pXGI->RelIO = (XGIIOADDRESS)(((unsigned long)VGAHWPTR(pScrn)->Base & 0xFFFFFFFC) + pXGI->IODBase);
#else
pXGI->RelIO = (XGIIOADDRESS) (pXGI->IODBase |