diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-03-11 10:50:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-03-11 10:50:32 +1000 |
| commit | 9c5bd06addbd5470c891760b1ba84c27eddeecad (patch) | |
| tree | e03daebf0cd601c96708d9cb10504421d70375a5 | |
| parent | 5e0510dd0144c8ee85b2bd8bde58ae212f0d8453 (diff) | |
further build fixes
| -rw-r--r-- | src/apm.h | 2 | ||||
| -rw-r--r-- | src/apm_driver.c | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -128,7 +128,7 @@ typedef struct { unsigned char savedSR10; CARD8 MiscOut; CARD8 c9, d9, db, Rush; - unsigned long saveCmd; + unsigned int saveCmd; pointer FontInfo; Bool hwCursor; Bool noLinear; diff --git a/src/apm_driver.c b/src/apm_driver.c index b5b5874..9e4603a 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -415,9 +415,11 @@ ApmProbe(DriverPtr drv, int flags) * file info to override any contradictions. */ +#ifndef XSERVER_LIBPCIACCESS if (xf86GetPciVideoInfo() == NULL) { return FALSE; } +#endif numUsed = xf86MatchPciInstances(APM_NAME, PCI_VENDOR_ALLIANCE, ApmChipsets, ApmPciChipsets, DevSections, numDevSections, drv, &usedChips); @@ -1928,8 +1930,10 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (pApm->noLinear) { PCI_READ_LONG(pApm->PciInfo, &pApm->saveCmd, PCI_CMD_STAT_REG); PCI_WRITE_LONG(pApm->PciInfo, pApm->saveCmd | (PCI_CMD_IO_ENABLE | PCI_CMD_MEM_ENABLE), PCI_CMD_STAT_REG); +#ifndef XSERVER_LIBPCIACCESS pApm->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, pApm->PciTag, 0xA0000, 0x10000); +#endif } else if (!ApmMapMem(pScrn)) |