diff options
| author | root <root@rshg054.dnsready.net> | 2012-02-10 23:15:14 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-02-10 23:15:14 +0000 |
| commit | 9d1489b877a1fa7c2674cf1f744804db42d93bfc (patch) | |
| tree | 33f1f96e0a8a2cc9a6a2939dfa0517a2ea47dcce /staging/xf86-video-apm/apm-1.2.3-git.patch | |
| parent | 4bc61018eec54dbe50e7556ce01d2ef2859b2c9f (diff) | |
Fri Feb 10 23:15:14 UTC 2012
Diffstat (limited to 'staging/xf86-video-apm/apm-1.2.3-git.patch')
| -rw-r--r-- | staging/xf86-video-apm/apm-1.2.3-git.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/staging/xf86-video-apm/apm-1.2.3-git.patch b/staging/xf86-video-apm/apm-1.2.3-git.patch new file mode 100644 index 000000000..1c6afb29d --- /dev/null +++ b/staging/xf86-video-apm/apm-1.2.3-git.patch @@ -0,0 +1,34 @@ +diff --git a/src/apm.h b/src/apm.h +index bc66714..86c7663 100644 +--- a/src/apm.h ++++ b/src/apm.h +@@ -109,7 +109,7 @@ typedef struct { + char *MemMap; + pointer BltMap; + Bool UnlockCalled; +- IOADDRESS iobase, xport, xbase; ++ unsigned long iobase, xport, xbase; + unsigned char savedSR10; + CARD8 MiscOut; + CARD8 c9, d9, db, Rush; +diff --git a/src/apm_driver.c b/src/apm_driver.c +index f172bab..f77bb2b 100644 +--- a/src/apm_driver.c ++++ b/src/apm_driver.c +@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) + + hwp = VGAHWPTR(pScrn); + vgaHWGetIOBase(hwp); +- pApm->iobase = hwp->PIOOffset; +- pApm->xport = hwp->PIOOffset + 0x3C4; ++#if ABI_VIDEODRV_VERSION < 12 ++#define PIOOFFSET hwp->PIOOffset ++#else ++/* FIXME reintroduce domain support */ ++#define PIOOFFSET 0 ++#endif ++ pApm->iobase = PIOOFFSET; ++ pApm->xport = PIOOFFSET + 0x3C4; + + /* Set pScrn->monitor */ + pScrn->monitor = pScrn->confScreen->monitor; |