diff options
| author | Julien Cristau <jcristau@debian.org> | 2012-05-01 15:27:40 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2012-05-01 15:40:03 +0200 |
| commit | e92c8ed0b03b5a33f4b0c3966e540a31af760402 (patch) | |
| tree | 3f707ba3d91919a2f690eefaa8c9917fca22d7c8 | |
| parent | 37630bd20e59e49db3ee0bfa77f82a7c2595a0ac (diff) | |
Disable PC98 code on newer servers
It was removed in xserver commit
6ad7bb69eebd5e5b4068bd9aa0b9a7168f075006, and keeping API compatibility
would have been too hard. Or something.
| -rw-r--r-- | src/apm_driver.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/apm_driver.c b/src/apm_driver.c index 8f25a3c..c35f489 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -776,7 +776,10 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM: %d kByte\n", pScrn->videoRam); - if (!xf86IsPc98()) { +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + if (!xf86IsPc98()) +#endif + { hwp->MapSize = 0x10000; vgaHWMapMem(pScrn); if (pApm->I2C) { @@ -1378,8 +1381,10 @@ ApmModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) hwp->writeMiscOut(hwp, pApm->MiscOut | 0x0F); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) outb(0xFAC, 0xFF); +#endif memcpy(ApmReg, &pApm->SavedReg, sizeof pApm->SavedReg); @@ -1973,8 +1978,10 @@ ApmLeaveVT(int scrnIndex, int flags) } WRXB(0xC9, pApm->c9); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) outb(0xFAC, 0xFE); +#endif } /* @@ -2008,8 +2015,10 @@ ApmCloseScreen(int scrnIndex, ScreenPtr pScreen) pScrn->vtSema = FALSE; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (xf86IsPc98()) outb(0xFAC, 0xFE); +#endif pScreen->CloseScreen = pApm->CloseScreen; return (*pScreen->CloseScreen)(scrnIndex, pScreen); |