Merge branch 'mach64-pci-1'

1 files changed, 3 insertions, 48 deletions

diff --git a/src/atiprint.c b/src/atiprint.c
index 11cf6b7..243dcf5 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -28,7 +28,6 @@
 #include <ctype.h>
 
 #include "ati.h"
-#include "atiadapter.h"
 #include "atichip.h"
 #include "atidac.h"
 #include "atimach64io.h"
@@ -365,11 +364,11 @@ ATIPrintRegisters
 
 #ifndef AVOID_CPIO
 
-    CARD8 genmo, seq1 = 0;
+    CARD8 genmo;
 
     crtc = ATI_CRTC_VGA;
 
-    if (pATI->VGAAdapter != ATI_ADAPTER_NONE)
+    if (pATI->VGAAdapter)
     {
         xf86ErrorFVerb(4, "\n Miscellaneous output register value:  0x%02X.\n",
             genmo = inb(R_GENMO));
@@ -469,36 +468,10 @@ ATIPrintRegisters
         ATIPrintIndexedRegisters(SEQX, 0, 8, "Sequencer", 0);
 
         if (pATI->CPIO_VGAWonder)
-            ATIPrintIndexedRegisters(pATI->CPIO_VGAWonder,
-                xf86ServerIsOnlyProbing() ? 0x80U : pATI->VGAOffset, 0xC0U,
+            ATIPrintIndexedRegisters(pATI->CPIO_VGAWonder, 0x80U, 0xC0U,
                 "ATI extended VGA", 0);
     }
 
-    if (pATI->ChipHasSUBSYS_CNTL)
-    {
-        xf86ErrorFVerb(4, "\n 8514/A register values:");
-        for (Index = 0x02E8U;  Index <= 0x0FEE8;  Index += 0x0400U)
-        {
-            if (!((Index - 0x02E8U) & 0x0C00U))
-                xf86ErrorFVerb(4, "\n 0x%04X: ", Index);
-            xf86ErrorFVerb(4, " %04X", inw(Index));
-        }
-
-        if (pATI->Adapter >= ATI_ADAPTER_MACH8)
-        {
-            xf86ErrorFVerb(4, "\n\n Mach8/Mach32 register values:");
-            for (Index = 0x02EEU;  Index <= 0x0FEEE;  Index += 0x0400U)
-            {
-                if (!((Index - 0x02EEU) & 0x0C00U))
-                    xf86ErrorFVerb(4, "\n 0x%04X: ", Index);
-                xf86ErrorFVerb(4, " %04X", inw(Index));
-            }
-        }
-
-        xf86ErrorFVerb(4, "\n");
-    }
-    else
-
 #endif /* AVOID_CPIO */
 
     if (pATI->Chip == ATI_CHIP_264LT)
@@ -565,13 +538,6 @@ ATIPrintRegisters
         xf86ErrorFVerb(4, "\n");
     }
     else
-
-#ifndef AVOID_CPIO
-
-    if (pATI->Chip >= ATI_CHIP_88800GXC)
-
-#endif /* AVOID_CPIO */
-
     {
 
 #ifdef AVOID_CPIO
@@ -634,14 +600,6 @@ ATIPrintRegisters
 
     ATISetDACIOPorts(pATI, crtc);
 
-    /* Temporarily turn off CLKDIV2 while reading DAC's LUT */
-    if (pATI->Adapter == ATI_ADAPTER_NONISA)
-    {
-        seq1 = GetReg(SEQX, 0x01U);
-        if (seq1 & 0x08U)
-            PutReg(SEQX, 0x01U, seq1 & ~0x08U);
-    }
-
     dac_read = inb(pATI->CPIO_DAC_READ);
     DACDelay;
     dac_write = inb(pATI->CPIO_DAC_WRITE);
@@ -678,9 +636,6 @@ ATIPrintRegisters
     outb(pATI->CPIO_DAC_READ, dac_read);
     DACDelay;
 
-    if ((pATI->Adapter == ATI_ADAPTER_NONISA) && (seq1 & 0x08U))
-        PutReg(SEQX, 0x01U, seq1);
-
 #endif /* AVOID_CPIO */
 
     if ((pVideo = pATI->PCIInfo))