diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-18 23:21:33 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-18 23:51:11 -0700 |
| commit | 8a5ea07f30cc71ecc413fad0713facff72f77472 (patch) | |
| tree | 7723fcbbf83a4b26f5712d3769cb8ce82fe1082d | |
| parent | c421f2477c99990d0dc712d6aece981fa6c961e5 (diff) | |
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/ct_driver.c | 5 | ||||
| -rw-r--r-- | src/ct_driver.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ct_driver.c b/src/ct_driver.c index e6538c6..a2e5c94 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) hwp = VGAHWPTR(pScrn); vgaHWGetIOBase(hwp); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 cPtr->PIOBase = hwp->PIOOffset; +#else + cPtr->PIOBase = 0; +#endif + /* * Must allow ensure that storage for the 2nd set of vga registers is * allocated for dual channel cards diff --git a/src/ct_driver.h b/src/ct_driver.h index 39eeb6e..9033867 100644 --- a/src/ct_driver.h +++ b/src/ct_driver.h @@ -276,8 +276,8 @@ typedef struct _CHIPSRec { #endif int Chipset; EntityInfoPtr pEnt; - IOADDRESS PIOBase; - CARD32 IOAddress; + unsigned long PIOBase; + unsigned long IOAddress; unsigned long FbAddress; unsigned int IOBase; unsigned char * FbBase; |