[devel-remove_HAVE_DEBUG_entirely]

- Remove HAVE_DEBUG dependance.
- Have all PrintReg code present at all times.
- Pass __func__ to PrintReg functions directly.

10 files changed, 69 insertions, 124 deletions

diff --git a/src/via_ch7xxx.c b/src/via_ch7xxx.c
index cf6c695..ee80296 100644
--- a/src/via_ch7xxx.c
+++ b/src/via_ch7xxx.c
@@ -43,14 +43,14 @@ enum CH7xxxDevices {
  *
  */
 static void
-CH7xxxPrintRegs(ScrnInfoPtr pScrn)
+CH7xxxPrintRegs(ScrnInfoPtr pScrn, const char *function)
 {
     struct ViaModeInfo  *ModeInfo = VIAPTR(pScrn)->ModeInfo;
     CARD8 i, buf;
     
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Printing registers for %s\n",
-	       ModeInfo->TVI2CDev->DevName);
-
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s: Printing registers for %s\n",
+	       function, ModeInfo->TVI2CDev->DevName);
+    
     for (i = 0; i < 0x4C; i++) {
 	xf86I2CReadByte(ModeInfo->TVI2CDev, i, &buf);
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s %02X: 0x%02X\n",
diff --git a/src/via_driver.c b/src/via_driver.c
index 66c04a1..525dd42 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -122,12 +122,10 @@ static PciChipsets VIAPciChipsets[] = {
 int gVIAEntityIndex = -1;
 
 typedef enum {
-#ifdef HAVE_DEBUG
     OPTION_PRINTVGAREGS,
     OPTION_PRINTTVREGS,
     OPTION_PRINTSWOVREGS,
     OPTION_I2CSCAN,
-#endif /* HAVE_DEBUG */
     OPTION_PCI_BURST,
     OPTION_PCI_RETRY,
     OPTION_NOACCEL,
@@ -158,12 +156,12 @@ typedef enum {
 
 static OptionInfoRec VIAOptions[] =
 {
-#ifdef HAVE_DEBUG /* Don't document these */
+    /* Debug only. Don't document these */
     {OPTION_PRINTVGAREGS, "PrintVGARegs", OPTV_BOOLEAN, {0}, FALSE},
     {OPTION_PRINTTVREGS, "PrintTVRegs",  OPTV_BOOLEAN, {0}, FALSE},
     {OPTION_PRINTSWOVREGS, "PrintSwovRegs",  OPTV_BOOLEAN, {0}, FALSE},
     {OPTION_I2CSCAN, "I2CScan", OPTV_BOOLEAN, {0}, FALSE},
-#endif /* HAVE_DEBUG */
+    /* Normal options */
     {OPTION_NOACCEL,    "NoAccel",      OPTV_BOOLEAN, {0}, FALSE},
     {OPTION_HWCURSOR,   "HWCursor",     OPTV_BOOLEAN, {0}, FALSE},
     {OPTION_SWCURSOR,   "SWCursor",     OPTV_BOOLEAN, {0}, FALSE},
@@ -1291,10 +1289,9 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
     }
     hwp = VGAHWPTR(pScrn);
 
-#ifdef HAVE_DEBUG
     if (xf86ReturnOptValBool(VIAOptions, OPTION_PRINTVGAREGS, FALSE)) {
         pVia->PrintVGARegs = TRUE;
-	ViaVgahwPrint(VGAHWPTR(pScrn)); /* Do this as early as possible */
+	ViaVgaPrintRegs(pScrn, __func__); /* Do this as early as possible */
     } else
         pVia->PrintVGARegs = FALSE;
 
@@ -1312,7 +1309,6 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
         pVia->I2CScan = TRUE;
     else
         pVia->I2CScan = FALSE;
-#endif /* HAVE_DEBUG */
 
     xf86DrvMsg(pScrn->scrnIndex, from, "Chipset Rev.: %d\n", pVia->ChipRev);
 
@@ -2191,18 +2187,12 @@ VIAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     if (serverGeneration == 1)
         xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
 
-#ifdef HAVE_DEBUG 
-    if (pVia->PrintVGARegs) {
-	xf86DrvMsg(scrnIndex, X_INFO, "VIAScreenInit: Printing VGA registers.\n");
-	ViaVgahwPrint(VGAHWPTR(pScrn));
-    }
-
-    if (pVia->PrintTVRegs) {
-	xf86DrvMsg(scrnIndex, X_INFO, "VIAScreenInit: Printing TV registers.\n");
-	ViaTVPrintRegs(pScrn);
-    }
-#endif
-
+    if (pVia->PrintVGARegs)
+	ViaVgaPrintRegs(pScrn, __func__);
+    
+    if (pVia->PrintTVRegs)
+	ViaTVPrintRegs(pScrn, __func__);
+    
     ViaDebug(scrnIndex, "- Done\n");
     return TRUE;
 }
diff --git a/src/via_driver.h b/src/via_driver.h
index 78a1c36..a6013ec 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -26,8 +26,6 @@
 #ifndef _VIA_DRIVER_H_
 #define _VIA_DRIVER_H_ 1
 
-#define HAVE_DEBUG
-
 #include "vgaHW.h"
 #include "xf86.h"
 #include "xf86Resources.h"
@@ -263,12 +261,10 @@ typedef struct _VIA {
     
     ViaSharedPtr	sharedData;
 
-#ifdef HAVE_DEBUG
     Bool  PrintVGARegs;
     Bool  PrintTVRegs;
     Bool  PrintSwovRegs;
     Bool  I2CScan;
-#endif /* HAVE_DEBUG */
 } VIARec, *VIAPtr;
 
 #define VIAPTR(p) ((VIAPtr)((p)->driverPrivate))
diff --git a/src/via_i2c.c b/src/via_i2c.c
index ff76f0f..aa0e3f3 100644
--- a/src/via_i2c.c
+++ b/src/via_i2c.c
@@ -375,7 +375,6 @@ ViaI2CBus3Init(int scrnIndex)
     return pI2CBus;
 }
 
-#ifdef HAVE_DEBUG
 /*
  *
  */
@@ -384,15 +383,13 @@ ViaI2CScan(I2CBusPtr Bus)
 {
     CARD8 i;
 
-    xf86DrvMsg(Bus->scrnIndex, X_INFO, "ViaI2CScan: Scanning %s\n",
-	       Bus->BusName);
+    ViaDebug(Bus->scrnIndex, "%s: Scanning %s\n", __func__, Bus->BusName);
 
     for (i = 0x10; i < 0xF0; i += 2)
 	if (xf86I2CProbeAddress(Bus, i))
-	    xf86DrvMsg(Bus->scrnIndex, X_PROBED, "Found slave on %s "
-		       "- 0x%02X\n", Bus->BusName, i);
+	    ViaDebug(Bus->scrnIndex, "Found slave on %s - 0x%02X\n",
+                     Bus->BusName, i);
 }
-#endif
 
 /*
  *
@@ -410,12 +407,10 @@ ViaI2CInit(ScrnInfoPtr pScrn)
     pVia->pI2CBus2 = ViaI2CBus2Init(pScrn->scrnIndex);
     pVia->pI2CBus3 = ViaI2CBus3Init(pScrn->scrnIndex);
 
-#ifdef HAVE_DEBUG
     if (pVia->I2CScan) {
 	if (pVia->pI2CBus2)
 	    ViaI2CScan(pVia->pI2CBus2);
 	if (pVia->pI2CBus3)
 	    ViaI2CScan(pVia->pI2CBus3);
     }
-#endif
 }
diff --git a/src/via_mode.c b/src/via_mode.c
index e02e203..cfbb917 100644
--- a/src/via_mode.c
+++ b/src/via_mode.c
@@ -40,6 +40,40 @@
 #include "via_mode.h"
 
 /*
+ * Some VGA register debugging.
+ */
+void
+ViaVgaPrintRegs(ScrnInfoPtr pScrn, const char *function)
+{
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
+    int i;
+
+    ViaDebug(pScrn->scrnIndex, "%s: Printing VGA registers:\n", function);
+    ViaDebug(pScrn->scrnIndex, "Printing VGA Sequence registers:\n");
+    for (i = 0x00; i < 0x80; i++)
+	ViaDebug(pScrn->scrnIndex, "SR%02X: 0x%02X\n", i, hwp->readSeq(hwp, i));
+
+    ViaDebug(pScrn->scrnIndex, "Printing VGA CRTM/C registers:\n");
+    for (i = 0x00; i < 0x19; i++)
+        ViaDebug(pScrn->scrnIndex, "CR%02X: 0x%02X\n", i, hwp->readCrtc(hwp, i));
+    for (i = 0x33; i < 0xA3; i++)
+	ViaDebug(pScrn->scrnIndex, "CR%02X: 0x%02X\n", i, hwp->readCrtc(hwp, i));
+
+    ViaDebug(pScrn->scrnIndex, "Printing VGA Graphics registers:\n");
+    for (i = 0x00; i < 0x08; i++)
+	ViaDebug(pScrn->scrnIndex, "GR%02X: 0x%02X\n", i, hwp->readGr(hwp, i));
+
+    ViaDebug(pScrn->scrnIndex, "Printing VGA Attribute registers:\n");
+    for (i = 0x00; i < 0x14; i++)
+	ViaDebug(pScrn->scrnIndex, "AR%02X: 0x%02X\n", i, hwp->readAttr(hwp, i));
+    
+    ViaDebug(pScrn->scrnIndex, "Printing VGA Miscellaneous register:\n");
+    ViaDebug(pScrn->scrnIndex, "Misc: 0x%02X\n", hwp->readMiscOut(hwp));
+
+    ViaDebug(pScrn->scrnIndex, "End of VGA Registers.\n");
+}
+
+/*
  *
  * TV specific code.
  *
@@ -141,10 +175,8 @@ ViaTVInit(ScrnInfoPtr pScrn)
         /* Save now */
         ModeInfo->TVSave(pScrn);
         
-#ifdef HAVE_DEBUG
         if (VIAPTR(pScrn)->PrintTVRegs)
-            ModeInfo->TVPrintRegs(pScrn);
-#endif
+            ModeInfo->TVPrintRegs(pScrn, __func__);
 
         return TRUE;
     }
@@ -191,16 +223,14 @@ ViaTVPower(ScrnInfoPtr pScrn, Bool On)
 	ModeInfo->TVPower(pScrn, On);
 } 
 
-#ifdef HAVE_DEBUG
 void
-ViaTVPrintRegs(ScrnInfoPtr pScrn)
+ViaTVPrintRegs(ScrnInfoPtr pScrn, const char *function)
 {
     struct ViaModeInfo  *ModeInfo = VIAPTR(pScrn)->ModeInfo;
 
     if (ModeInfo->TVPrintRegs)
-	ModeInfo->TVPrintRegs(pScrn);
+	ModeInfo->TVPrintRegs(pScrn, function);
 }
-#endif /* HAVE_DEBUG */
 
 /*
  *
@@ -258,31 +288,6 @@ ViaOutputsDetect(ScrnInfoPtr pScrn)
 	ModeInfo->TVOutput = 0;
 }
 
-#ifdef HAVE_DEBUG
-/*
- * Returns:
- *   Bit[7] 2nd Path
- *   Bit[6] 1/0 MHS Enable/Disable
- *   Bit[5] 0 = Bypass Callback, 1 = Enable Callback
- *   Bit[4] 0 = Hot-Key Sequence Control (OEM Specific)
- *   Bit[3] LCD
- *   Bit[2] TV
- *   Bit[1] CRT
- *   Bit[0] DVI
- */
-static CARD8 
-VIAGetActiveDisplay(ScrnInfoPtr pScrn)
-{
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-    CARD8    tmp;
-
-    tmp = (hwp->readCrtc(hwp, 0x3E) >> 4);
-    tmp |= ((hwp->readCrtc(hwp, 0x3B) & 0x18) << 3);
-
-    return tmp;
-}
-#endif /* HAVE_DEBUG */
-
 /*
  *
  */
@@ -291,17 +296,18 @@ ViaOutputsSelect(ScrnInfoPtr pScrn)
 {
     VIAPtr pVia = VIAPTR(pScrn);
     struct ViaModeInfo  *ModeInfo = pVia->ModeInfo;
+    vgaHWPtr hwp = VGAHWPTR(pScrn);
 
     if (pVia->IsSecondary) { /* we just abort for now */
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ViaOutputsSelect:"
-		   " Not handling secondary.\n");
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: Not handling secondary.\n",
+                   __func__);
 	return FALSE;
     }
 
     VIAFUNC(pScrn->scrnIndex);
     ViaDebug(pScrn->scrnIndex, "X Configuration: 0x%02x\n", pVia->ActiveDevice);
     ViaDebug(pScrn->scrnIndex, "BIOS Initialised register: 0x%02x\n",
-             VIAGetActiveDisplay(pScrn));
+             hwp->readCrtc(hwp, 0x3E));
 
     ModeInfo->PanelActive = FALSE;
     ModeInfo->CrtActive = FALSE;
@@ -390,7 +396,7 @@ ViaSetPrimaryDotclock(ScrnInfoPtr pScrn, CARD32 clock)
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     VIAPtr pVia = VIAPTR(pScrn);
 
-    ViaDebug(hwp->pScrn->scrnIndex, "%s to 0x%lX\n", __func__, clock);
+    ViaDebug(pScrn->scrnIndex, "%s to 0x%lX\n", __func__, clock);
 
     if ((pVia->Chipset == VT3122) || (pVia->Chipset == VT7205)) {
 	hwp->writeSeq(hwp, 0x46, clock >> 8);
@@ -415,7 +421,7 @@ ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock)
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     VIAPtr pVia = VIAPTR(pScrn);
 
-    ViaDebug(hwp->pScrn->scrnIndex, "%s to 0x%lX\n", __func__, clock);
+    ViaDebug(pScrn->scrnIndex, "%s to 0x%lX\n", __func__, clock);
 
     if ((pVia->Chipset == VT3122) || (pVia->Chipset == VT7205)) {
 	hwp->writeSeq(hwp, 0x44, clock >> 8);
diff --git a/src/via_mode.h b/src/via_mode.h
index ca9bbdd..d1883f6 100644
--- a/src/via_mode.h
+++ b/src/via_mode.h
@@ -99,7 +99,7 @@ struct ViaModeInfo {
     ModeStatus (*TVModeValid) (ScrnInfoPtr pScrn, DisplayModePtr mode);
     void (*TVMode) (ScrnInfoPtr pScrn, DisplayModePtr mode);
     void (*TVPower) (ScrnInfoPtr pScrn, Bool On);
-    void (*TVPrintRegs) (ScrnInfoPtr pScrn);
+    void (*TVPrintRegs) (ScrnInfoPtr pScrn, const char *function);
 };
 
 /* Function prototypes */
@@ -113,9 +113,9 @@ void ViaModeSecondary(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaTVPower(ScrnInfoPtr pScrn, Bool On);
 void ViaTVSave(ScrnInfoPtr pScrn);
 void ViaTVRestore(ScrnInfoPtr pScrn);
-#ifdef HAVE_DEBUG
-void ViaTVPrintRegs(ScrnInfoPtr pScrn);
-#endif
+
+void ViaVgaPrintRegs(ScrnInfoPtr pScrn, const char *function);
+void ViaTVPrintRegs(ScrnInfoPtr pScrn, const char *function);
 
 /* outputs: via_panel.c, via_vt162x.c and via_ch7xxx.c */
 Bool ViaPanelInit(ScrnInfoPtr pScrn, I2CDevPtr pDev);
diff --git a/src/via_vgahw.c b/src/via_vgahw.c
index 853b7f0..0b2c260 100644
--- a/src/via_vgahw.c
+++ b/src/via_vgahw.c
@@ -35,7 +35,6 @@
 #include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86.h"
-#include "via_driver.h" /* for HAVE_DEBUG */
 #include "via_vgahw.h"
 
 /*
@@ -159,36 +158,3 @@ ViaGrMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask)
 
     hwp->writeGr(hwp, index, tmp);
 }
-
-/*
- *
- */
-#ifdef HAVE_DEBUG
-void
-ViaVgahwPrint(vgaHWPtr hwp)
-{
-    int i;
-    xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "Printing VGA Sequence registers:\n");
-    for (i = 0x00; i < 0x80; i++)
-	xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "SR%02X: 0x%02X\n", i, hwp->readSeq(hwp, i));
-
-    xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "Printing VGA CRTM/C registers:\n");
-    for (i = 0x00; i < 0x19; i++)
-        xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "CR%02X: 0x%02X\n", i, hwp->readCrtc(hwp, i));
-    for (i = 0x33; i < 0xA3; i++)
-	xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "CR%02X: 0x%02X\n", i, hwp->readCrtc(hwp, i));
-
-    xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "Printing VGA Graphics registers:\n");
-    for (i = 0x00; i < 0x08; i++)
-	xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "GR%02X: 0x%02X\n", i, hwp->readGr(hwp, i));
-
-    xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "Printing VGA Attribute registers:\n");
-    for (i = 0x00; i < 0x14; i++)
-	xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "AR%02X: 0x%02X\n", i, hwp->readAttr(hwp, i));
-    
-    xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "Printing VGA Miscellaneous register:\n");
-    xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "Misc: 0x%02X\n", hwp->readMiscOut(hwp));
-
-    xf86DrvMsg(hwp->pScrn->scrnIndex, X_INFO, "End of VGA Registers.\n");
-}
-#endif /* HAVE_DEBUG */
diff --git a/src/via_vgahw.h b/src/via_vgahw.h
index 10047bb..66e3000 100644
--- a/src/via_vgahw.h
+++ b/src/via_vgahw.h
@@ -44,8 +44,4 @@ void ViaCrtcMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
 void ViaSeqMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
 void ViaGrMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
 
-#ifdef HAVE_DEBUG
-void ViaVgahwPrint(vgaHWPtr hwp);
-#endif /* HAVE_DEBUG */
-
 #endif /* _VIA_VGAHW_H_ */
diff --git a/src/via_video.c b/src/via_video.c
index e25b3b3..94c579b 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -206,18 +206,17 @@ static XF86ImageRec ImagesG[NUM_IMAGES_G] =
     XVIMAGE_RV32
 };
 
-#ifdef HAVE_DEBUG
 /*
  *
  * Dump Video registers.
  *
  */
 static void
-ViaSwovPrintRegs(struct ViaSwov *Swov)
+ViaSwovPrintRegs(struct ViaSwov *Swov, const char *function)
 {
     VIAFUNC(Swov->scrnIndex);
 
-    ViaDebug(Swov->scrnIndex, "Video Map:\n");
+    ViaDebug(Swov->scrnIndex, "%s: Video Map:\n", function);
     ViaDebug(Swov->scrnIndex, "Flags: 0x%08X.\n", Swov->Video->Flags);
     ViaDebug(Swov->scrnIndex, "Status: 0x%08X.\n", Swov->Video->Status);
     ViaDebug(Swov->scrnIndex, "CrtStartAddress: 0x%08X.\n", Swov->Video->CrtStartAddress);
@@ -296,7 +295,6 @@ ViaSwovPrintRegs(struct ViaSwov *Swov)
     ViaDebug(Swov->scrnIndex, "SrcStride: 0x%08X.\n", Swov->HQV->SrcStride);
     ViaDebug(Swov->scrnIndex, "DstAddress2: 0x%08X.\n", Swov->HQV->DstAddress2);
 }
-#endif /* HAVE_DEBUG */
 
 /*
  * Another bloody ugly mess.
@@ -2136,10 +2134,8 @@ ViaSwovInit(ScrnInfoPtr pScrn)
     Swov->Video = (struct ViaVideoRegs *) (pVia->MapBase + 0x200);
     Swov->HQV = (struct ViaHQVRegs *) (pVia->MapBase + 0x3D0);
 
-#ifdef HAVE_DEBUG
     if (pVia->PrintSwovRegs)
-        ViaSwovPrintRegs(Swov);
-#endif
+        ViaSwovPrintRegs(Swov, __func__);
 
     /* old HWDiff stuff */
     switch(pVia->Chipset) {
diff --git a/src/via_vt162x.c b/src/via_vt162x.c
index 3f7177f..e82bbdd 100644
--- a/src/via_vt162x.c
+++ b/src/via_vt162x.c
@@ -47,14 +47,14 @@ enum VT162xDevices {
  *
  */
 static void
-VT162xPrintRegs(ScrnInfoPtr pScrn)
+VT162xPrintRegs(ScrnInfoPtr pScrn, const char *function)
 {
     struct ViaModeInfo  *ModeInfo = VIAPTR(pScrn)->ModeInfo;
     CARD8 i, buf;
     
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Printing registers for %s\n",
-	       ModeInfo->TVI2CDev->DevName);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s: Printing registers for %s\n",
+	       function, ModeInfo->TVI2CDev->DevName);
 
     for (i = 0; i < 0x68; i++) {
 	xf86I2CReadByte(ModeInfo->TVI2CDev, i, &buf);