fix the build for the non-pci-rework case (compile tested only)

This commit is contained in:
Alex Deucher
2007-09-14 20:21:12 -04:00
parent 846a69f70d
commit 9c959f53ca
2 changed files with 8 additions and 2 deletions

View File

@@ -40,6 +40,7 @@
#endif
#include <unistd.h>
#include <errno.h>
#include "xf86RAC.h"
#include "shadowfb.h"
@@ -3080,9 +3081,9 @@ static Bool SavageMapMem(ScrnInfoPtr pScrn)
+ psav->PciInfo->regions[0].base_addr;
psav->FbRegion.base = psav->PciInfo->regions[1].base_addr;
#else
psav->MmioBase = SAVAGE_NEWMMIO_REGBASE_S4
psav->MmioRegion.base = SAVAGE_NEWMMIO_REGBASE_S4
+ psav->PciInfo->memBase[0];
psav->FrameBufferBase = psav->PciInfo->memBase[1];
psav->FbRegion.base = psav->PciInfo->memBase[1];
#endif
}

View File

@@ -280,8 +280,13 @@ typedef struct _StatInfo {
} StatInfoRec,*StatInfoPtr;
struct savage_region {
#ifdef XSERVER_LIBPCIACCESS
pciaddr_t base;
pciaddr_t size;
#else
unsigned long base;
unsigned long size;
#endif
void * memory;
};