Remove last remnants of checking whether we have PCIInfo.

If we don't have PCIInfo, then we shouldn't have progressed beyond Probe in the
first place.

4 files changed, 37 insertions, 116 deletions

diff --git a/src/aticonfig.c b/src/aticonfig.c
index a2df762..91731f8 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -177,15 +177,7 @@ ATIProcessOptions
 
     ReferenceClock = ((double)157500000.0) / ((double)11.0);
 
-#ifndef AVOID_CPIO
-
-    if (pATI->PCIInfo)
-
-#endif /* AVOID_CPIO */
-
-    {
-        ShadowFB = TRUE;
-    }
+    ShadowFB = TRUE;
 
     Blend = PanelDisplay = TRUE;
 #ifdef XF86DRI_DEVEL
diff --git a/src/atipreinit.c b/src/atipreinit.c
index f5dd9db..e8b513b 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -259,6 +259,9 @@ ATIMach64Probe(ATIPtr pATI)
 
         IOValue = inr(CONFIG_STATUS64_0);
         pATI->BusType = GetBits(IOValue, CFG_BUS_TYPE);
+        if (pATI->BusType != ATI_BUS_PCI)
+            xf86Msg(X_WARNING, "Mach64 GX/CX claims not to be a PCI device.\n");
+
         IOValue &= (CFG_VGA_EN | CFG_CHIP_EN);
 
         if (pATI->Chip == ATI_CHIP_88800CX)
diff --git a/src/atiprint.c b/src/atiprint.c
index d44f24f..6cb401b 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -351,13 +351,8 @@ ATIRGB514PrintRegisters
  * Display various registers when the server is invoked with -verbose.
  */
 void
-ATIPrintRegisters
-(
-    ATIPtr pATI
-)
+ATIPrintRegisters(ATIPtr pATI)
 {
-    pciVideoPtr  pVideo;
-    pciConfigPtr pPCI;
     int          Index;
     CARD32       lcd_index, tv_out_index, lcd_gen_ctrl;
     CARD8        dac_read, dac_mask, dac_write;
@@ -644,17 +639,13 @@ ATIPrintRegisters
 
 #endif /* AVOID_CPIO */
 
-    if ((pVideo = pATI->PCIInfo))
-    {
-        pPCI = pVideo->thisCard;
-        xf86ErrorFVerb(4, "\n\n PCI configuration register values:");
-        for (Index = 0;  Index < 256;  Index+= 4)
-        {
-            if (!(Index & 15))
-                xf86ErrorFVerb(4, "\n 0x%02X: ", Index);
-            xf86ErrorFVerb(4, " 0x%08lX",
-			   (unsigned long)pciReadLong(pPCI->tag, Index));
-        }
+    xf86ErrorFVerb(4, "\n\n PCI configuration register values:");
+    for (Index = 0;  Index < 256;  Index+= 4) {
+        if (!(Index & 15))
+            xf86ErrorFVerb(4, "\n 0x%02X: ", Index);
+        xf86ErrorFVerb(4, " 0x%08lX",
+                       (unsigned long)pciReadLong
+                       (((pciConfigPtr)(pATI->PCIInfo->thisCard))->tag, Index));
     }
 
     xf86ErrorFVerb(4, "\n");
diff --git a/src/atividmem.c b/src/atividmem.c
index ba19459..f55fee2 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -175,51 +175,29 @@ ATIUnmapCursor
  * This function maps all apertures used by the driver.
  */
 Bool
-ATIMapApertures
-(
-    int    iScreen,
-    ATIPtr pATI
-)
+ATIMapApertures(int iScreen, ATIPtr pATI)
 {
-    pciVideoPtr   pVideo;
-    PCITAG        Tag;
-    unsigned long PageSize;
+    PCITAG Tag = ((pciConfigPtr)(pATI->PCIInfo->thisCard))->tag;
+    unsigned long PageSize = getpagesize();
 
     if (pATI->Mapped)
         return TRUE;
 
 #ifndef AVOID_CPIO
-
     if (!pATI->IsVGA)
-
 #endif /* AVOID_CPIO */
-
-    {
         if (!pATI->LinearBase && !pATI->Block0Base)
             return FALSE;
-    }
-
-    PageSize = getpagesize();
-
-    if ((pVideo = pATI->PCIInfo))
-        Tag = ((pciConfigPtr)(pVideo->thisCard))->tag;
-    else
-        Tag = 0;
 
 #ifndef AVOID_CPIO
-
     /* Map VGA aperture */
     if (pATI->IsVGA) {
         /*
          * No relocation, resizing, caching or write-combining of this
          * aperture is supported.  Hence, the hard-coded values here...
          */
-        if (pVideo)
-            pATI->pBank = xf86MapPciMem(iScreen, VIDMEM_MMIO,
-                Tag, 0x000A0000U, 0x00010000U);
-        else
-            pATI->pBank = xf86MapVidMem(iScreen, VIDMEM_MMIO,
-                0x000A0000U, 0x00010000U);
+        pATI->pBank = xf86MapPciMem(iScreen, VIDMEM_MMIO, Tag, 0x000A0000U,
+                                    0x00010000U);
 
         if (!pATI->pBank)
             return FALSE;
@@ -234,24 +212,14 @@ ATIMapApertures
 #endif /* AVOID_CPIO */
 
     /* Map linear aperture */
-    if (pATI->LinearBase)
-    {
-        if (pVideo)
-            pATI->pMemory = xf86MapPciMem(iScreen, VIDMEM_FRAMEBUFFER,
-                Tag, pATI->LinearBase, pATI->LinearSize);
-        else
-            pATI->pMemory = xf86MapVidMem(iScreen, VIDMEM_FRAMEBUFFER,
-                pATI->LinearBase, pATI->LinearSize);
-
-        if (!pATI->pMemory)
-        {
+    if (pATI->LinearBase) {
+        pATI->pMemory = xf86MapPciMem(iScreen, VIDMEM_FRAMEBUFFER,
+                                      Tag, pATI->LinearBase, pATI->LinearSize);
 
+        if (!pATI->pMemory) {
 #ifndef AVOID_CPIO
-
             ATIUnmapVGA(iScreen, pATI);
-
 #endif /* AVOID_CPIO */
-
             pATI->Mapped = FALSE;
             return FALSE;
         }
@@ -272,57 +240,38 @@ ATIMapApertures
          * Map the little-endian aperture (used for video, etc.).  Note that
          * caching of this area is _not_ wanted.
          */
-        if (pVideo)
-        {
-            pATI->pMemoryLE = xf86MapPciMem(iScreen, VIDMEM_MMIO, Tag,
-                pATI->LinearBase - 0x00800000U, pATI->LinearSize);
-
-            if (!pATI->pMemoryLE)
-            {
-                ATIUnmapLinear(iScreen, pATI);
+        pATI->pMemoryLE = xf86MapPciMem(iScreen, VIDMEM_MMIO, Tag,
+                                        pATI->LinearBase - 0x00800000U,
+                                        pATI->LinearSize);
+        if (!pATI->pMemoryLE) {
+            ATIUnmapLinear(iScreen, pATI);
 
 #ifndef AVOID_CPIO
-
-                ATIUnmapVGA(iScreen, pATI);
-
+            ATIUnmapVGA(iScreen, pATI);
 #endif /* AVOID_CPIO */
 
-                pATI->Mapped = FALSE;
-                return FALSE;
-            }
+            pATI->Mapped = FALSE;
+            return FALSE;
         }
-
 #endif /* X_BYTE_ORDER */
-
     }
 
     /* Map MMIO aperture */
-    if (pATI->Block0Base)
-    {
+    if (pATI->Block0Base) {
         unsigned long MMIOBase = pATI->Block0Base & ~(PageSize - 1);
 
-        if (pVideo)
-            pATI->pMMIO = xf86MapPciMem(iScreen, VIDMEM_MMIO,
-                Tag, MMIOBase, PageSize);
-        else
-            pATI->pMMIO = xf86MapVidMem(iScreen, VIDMEM_MMIO,
-                MMIOBase, PageSize);
-
-        if (!pATI->pMMIO)
-        {
+        pATI->pMMIO = xf86MapPciMem(iScreen, VIDMEM_MMIO,
+                                    Tag, MMIOBase, PageSize);
+        if (!pATI->pMMIO) {
 
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
-
             ATIUnmapCursor(iScreen, pATI);
-
 #endif /* X_BYTE_ORDER */
 
             ATIUnmapLinear(iScreen, pATI);
 
 #ifndef AVOID_CPIO
-
             ATIUnmapVGA(iScreen, pATI);
-
 #endif /* AVOID_CPIO */
 
             pATI->Mapped = FALSE;
@@ -338,41 +287,27 @@ ATIMapApertures
             pATI->pBlock[1] = (char *)pATI->pBlock[0] - 0x00000400U;
 
 #if X_BYTE_ORDER == X_LITTLE_ENDIAN
-
         if (!pATI->pCursorImage)
-
 #endif /* X_BYTE_ORDER */
-
-        {
             if ((pATI->CursorBase >= MMIOBase) &&
                 ((pATI->CursorBase + 0x00000400UL) <= (MMIOBase + PageSize)))
                 pATI->pCursorImage = (char *)pATI->pMMIO +
                     (pATI->CursorBase - MMIOBase);
-        }
     }
 
     /* Map hardware cursor image area */
-    if (pATI->CursorBase && !pATI->pCursorImage)
-    {
+    if (pATI->CursorBase && !pATI->pCursorImage) {
         unsigned long CursorBase = pATI->CursorBase & ~(PageSize - 1);
 
-        if (pVideo)
-            pATI->pCursorPage = xf86MapPciMem(iScreen, VIDMEM_FRAMEBUFFER,
-                Tag, CursorBase, PageSize);
-        else
-            pATI->pCursorPage = xf86MapVidMem(iScreen, VIDMEM_FRAMEBUFFER,
-                CursorBase, PageSize);
-
-        if (!pATI->pCursorPage)
-        {
+        pATI->pCursorPage = xf86MapPciMem(iScreen, VIDMEM_FRAMEBUFFER,
+                                          Tag, CursorBase, PageSize);
+        if (!pATI->pCursorPage) {
             ATIUnmapCursor(iScreen, pATI);
             ATIUnmapMMIO(iScreen, pATI);
             ATIUnmapLinear(iScreen, pATI);
 
 #ifndef AVOID_CPIO
-
             ATIUnmapVGA(iScreen, pATI);
-
 #endif /* AVOID_CPIO */
 
             pATI->Mapped = FALSE;