diff options
Diffstat (limited to 'src/atiprobe.c')
| -rw-r--r-- | src/atiprobe.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/atiprobe.c b/src/atiprobe.c index 5c347bb..da214d4 100644 --- a/src/atiprobe.c +++ b/src/atiprobe.c @@ -25,6 +25,9 @@ #include "config.h" #endif +#include <string.h> +#include <stdio.h> + #include "ati.h" #include "atiadapter.h" #include "atiadjust.h" @@ -994,10 +997,8 @@ ATIProbe ATIPtr pATI, *ATIPtrs = NULL; GDevPtr *GDevs, pGDev; pciVideoPtr pVideo, *xf86PciVideoInfo = xf86GetPciVideoInfo(); - pciConfigPtr pPCI; ATIGDev *ATIGDevs = NULL, *pATIGDev; ScrnInfoPtr pScreenInfo; - CARD32 PciReg; Bool ProbeSuccess = FALSE; Bool DoRage128 = FALSE, DoRadeon = FALSE; int i, j, k; @@ -1005,10 +1006,18 @@ ATIProbe int Chipset; ATIChipType Chip; +#if !defined(AVOID_NON_PCI) || !defined(AVOID_CPIO) + pciConfigPtr pPCI; + CARD32 PciReg; +#endif /* AVOID_NON_PCI || AVOID_CPIO */ + +#ifndef AVOID_NON_PCI + ATIPtr pMach64[3] = {NULL, NULL, NULL}; +#endif + #ifndef AVOID_CPIO ATIPtr pVGA = NULL, p8514 = NULL; - ATIPtr pMach64[3] = {NULL, NULL, NULL}; pciConfigPtr *xf86PciInfo = xf86GetPciConfigInfo(); PortPtr PCIPorts = NULL; int nPCIPort = 0; |