Remove PrintVGARegs and PrintSwovRegs options.

Use the dump utility instead.

5 files changed, 0 insertions, 148 deletions

diff --git a/src/via_driver.c b/src/via_driver.c
index e70d6e2..24fbdd7 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -176,9 +176,7 @@ _X_EXPORT DriverRec UNICHROME =
 };
 
 typedef enum {
-    OPTION_PRINTVGAREGS,
     OPTION_PRINTTVREGS,
-    OPTION_PRINTSWOVREGS,
     OPTION_I2CSCAN,
     OPTION_SIMULTANEOUS,
     OPTION_ACCELMETHOD,
@@ -207,9 +205,7 @@ typedef enum {
 static OptionInfoRec VIAOptions[] =
 {
     /* 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},
     /* Normal options */
     {OPTION_SIMULTANEOUS, "Simultaneous", OPTV_BOOLEAN, {0}, FALSE},
@@ -1257,22 +1253,11 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
     pVia->FBDirectOption = xf86GetOptValBool(VIAOptions, OPTION_FBDIRECT,
 					     &pVia->FBDirect);
 
-    if (xf86ReturnOptValBool(VIAOptions, OPTION_PRINTVGAREGS, FALSE)) {
-        pVia->PrintVGARegs = TRUE;
-	ViaVgaPrintRegs(pScrn, __func__); /* Do this as early as possible */
-    } else
-        pVia->PrintVGARegs = FALSE;
-
     if (xf86ReturnOptValBool(VIAOptions, OPTION_PRINTTVREGS, FALSE))
         pVia->PrintTVRegs = TRUE;
     else
         pVia->PrintTVRegs = FALSE;
 
-    if (xf86ReturnOptValBool(VIAOptions, OPTION_PRINTSWOVREGS, FALSE))
-        pVia->PrintSwovRegs = TRUE;
-    else
-        pVia->PrintSwovRegs = FALSE;
-
     if (xf86ReturnOptValBool(VIAOptions, OPTION_I2CSCAN, FALSE))
         pVia->I2CScan = TRUE;
     else
@@ -2177,9 +2162,6 @@ VIAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     if (serverGeneration == 1)
         xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
 
-    if (pVia->PrintVGARegs)
-	ViaVgaPrintRegs(pScrn, __func__);
-
     if (pVia->PrintTVRegs)
 	ViaOutputsPrintRegs(pScrn, __func__);
 
diff --git a/src/via_driver.h b/src/via_driver.h
index c70ef45..87cb5c2 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -252,9 +252,7 @@ typedef struct _VIA {
     struct ViaSwov *    Swov;
 #endif
 
-    Bool  PrintVGARegs;
     Bool  PrintTVRegs;
-    Bool  PrintSwovRegs;
     Bool  I2CScan;
 } VIARec, *VIAPtr;
 
diff --git a/src/via_mode.c b/src/via_mode.c
index a1e6d77..47a77a3 100644
--- a/src/via_mode.c
+++ b/src/via_mode.c
@@ -47,40 +47,6 @@
 #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");
-}
-
-/*
  * Temporary.
  */
 static void
diff --git a/src/via_mode.h b/src/via_mode.h
index 59caa30..a3a280b 100644
--- a/src/via_mode.h
+++ b/src/via_mode.h
@@ -60,7 +60,6 @@
 
 /* Function prototypes */
 /* via_mode.c */
-void ViaVgaPrintRegs(ScrnInfoPtr pScrn, const char *function);
 void ViaModeSet(ScrnInfoPtr pScrn, DisplayModePtr mode);
 DisplayModePtr ViaCVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced, Bool Interlaced);
 DisplayModePtr ViaModesAdd(DisplayModePtr Modes, DisplayModePtr Additions);
diff --git a/src/via_video.c b/src/via_video.c
index a0cc053..1da9332 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -221,96 +221,6 @@ static XF86ImageRec ImagesG[NUM_IMAGES_G] =
 };
 
 /*
- *
- * Dump Video registers.
- *
- */
-static void
-ViaSwovPrintRegs(struct ViaSwov *Swov, const char *function)
-{
-    VIAFUNC(Swov);
-
-    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, "CRTC1StartAddress: 0x%08X.\n", Swov->Video->CRTC1StartAddress);
-    ViaDebug(Swov->scrnIndex, "CRTC2StartAddress2: 0x%08X.\n", Swov->Video->CRTC2StartAddress);
-    ViaDebug(Swov->scrnIndex, "ColorKey: 0x%08X.\n", Swov->Video->ColorKey);
-    ViaDebug(Swov->scrnIndex, "ColorKeySecond: 0x%08X.\n", Swov->Video->ColorKeySecond);
-    ViaDebug(Swov->scrnIndex, "ChromaKeyLow: 0x%08X.\n", Swov->Video->ChromaKeyLow);
-    ViaDebug(Swov->scrnIndex, "ChromaKeyHigh: 0x%08X.\n", Swov->Video->ChromaKeyHigh);
-    ViaDebug(Swov->scrnIndex, "HighControl: 0x%08X.\n", Swov->Video->HighControl);
-    ViaDebug(Swov->scrnIndex, "Compose: 0x%08X.\n", Swov->Video->Compose);
-
-    ViaDebug(Swov->scrnIndex, "AlphaWindowStart: 0x%08X.\n", Swov->Video->AlphaWindowStart);
-    ViaDebug(Swov->scrnIndex, "AlphaWindowEnd: 0x%08X.\n", Swov->Video->AlphaWindowEnd);
-    ViaDebug(Swov->scrnIndex, "AlphaControl: 0x%08X.\n", Swov->Video->AlphaControl);
-    ViaDebug(Swov->scrnIndex, "AlphaStride: 0x%08X.\n", Swov->Video->AlphaStride);
-    ViaDebug(Swov->scrnIndex, "AlphaAddress: 0x%08X.\n", Swov->Video->AlphaAddress);
-    ViaDebug(Swov->scrnIndex, "AlphaColorHigh: 0x%08X.\n", Swov->Video->AlphaColorHigh);
-
-    ViaDebug(Swov->scrnIndex, "Video1Control: 0x%08X.\n", Swov->Video->Video1Control);
-    ViaDebug(Swov->scrnIndex, "Video1Fetch: 0x%08X.\n", Swov->Video->Video1Fetch);
-    ViaDebug(Swov->scrnIndex, "Video1Stride: 0x%08X.\n", Swov->Video->Video1Stride);
-    ViaDebug(Swov->scrnIndex, "Video1WindowStart: 0x%08X.\n", Swov->Video->Video1WindowStart);
-    ViaDebug(Swov->scrnIndex, "Video1WindowEnd: 0x%08X.\n", Swov->Video->Video1WindowEnd);
-    ViaDebug(Swov->scrnIndex, "Video1Zoom: 0x%08X.\n", Swov->Video->Video1Zoom);
-    ViaDebug(Swov->scrnIndex, "Video1Minify: 0x%08X.\n", Swov->Video->Video1Minify);
-    ViaDebug(Swov->scrnIndex, "Video1Fifo: 0x%08X.\n", Swov->Video->Video1Fifo);
-    ViaDebug(Swov->scrnIndex, "Video1SrcSize: 0x%08X.\n", Swov->Video->Video1SrcSize);
-    ViaDebug(Swov->scrnIndex, "Video1DisplayTemp: 0x%08X.\n", Swov->Video->Video1DisplayTemp);
-    ViaDebug(Swov->scrnIndex, "Video1ColorSpace1: 0x%08X.\n", Swov->Video->Video1ColorSpace1);
-    ViaDebug(Swov->scrnIndex, "Video1ColorSpace2: 0x%08X.\n", Swov->Video->Video1ColorSpace2);
-    ViaDebug(Swov->scrnIndex, "Video1Opacity: 0x%08X.\n", Swov->Video->Video1Opacity);
-    ViaDebug(Swov->scrnIndex, "Video1Address0: 0x%08X.\n", Swov->Video->Video1Address0);
-    ViaDebug(Swov->scrnIndex, "Video1Address1: 0x%08X.\n", Swov->Video->Video1Address1);
-    ViaDebug(Swov->scrnIndex, "Video1Address2: 0x%08X.\n", Swov->Video->Video1Address2);
-    ViaDebug(Swov->scrnIndex, "Video1Address3: 0x%08X.\n", Swov->Video->Video1Address3);
-    ViaDebug(Swov->scrnIndex, "Video1UAddress0: 0x%08X.\n", Swov->Video->Video1UAddress0);
-    ViaDebug(Swov->scrnIndex, "Video1UAddress1: 0x%08X.\n", Swov->Video->Video1UAddress1);
-    ViaDebug(Swov->scrnIndex, "Video1UAddress2: 0x%08X.\n", Swov->Video->Video1UAddress2);
-    ViaDebug(Swov->scrnIndex, "Video1UAddress3: 0x%08X.\n", Swov->Video->Video1UAddress3);
-    ViaDebug(Swov->scrnIndex, "Video1VAddress0: 0x%08X.\n", Swov->Video->Video1VAddress0);
-    ViaDebug(Swov->scrnIndex, "Video1VAddress1: 0x%08X.\n", Swov->Video->Video1VAddress1);
-    ViaDebug(Swov->scrnIndex, "Video1VAddress2: 0x%08X.\n", Swov->Video->Video1VAddress2);
-    ViaDebug(Swov->scrnIndex, "Video1VAddress3: 0x%08X.\n", Swov->Video->Video1VAddress3);
-
-    ViaDebug(Swov->scrnIndex, "Video3SrcWidth: 0x%08X.\n", Swov->Video->Video3SrcWidth);
-    ViaDebug(Swov->scrnIndex, "Video3ColorKey: 0x%08X.\n", Swov->Video->Video3ColorKey);
-    ViaDebug(Swov->scrnIndex, "Video3Opacity: 0x%08X.\n", Swov->Video->Video3Opacity);
-    ViaDebug(Swov->scrnIndex, "Video3Control: 0x%08X.\n", Swov->Video->Video3Control);
-    ViaDebug(Swov->scrnIndex, "Video3Stride: 0x%08X.\n", Swov->Video->Video3Stride);
-    ViaDebug(Swov->scrnIndex, "Video3WindowStart: 0x%08X.\n", Swov->Video->Video3WindowStart);
-    ViaDebug(Swov->scrnIndex, "Video3WindowEnd: 0x%08X.\n", Swov->Video->Video3WindowEnd);
-    ViaDebug(Swov->scrnIndex, "Video3AlphaFetch: 0x%08X.\n", Swov->Video->Video3AlphaFetch);
-    ViaDebug(Swov->scrnIndex, "Video3Zoom: 0x%08X.\n", Swov->Video->Video3Zoom);
-    ViaDebug(Swov->scrnIndex, "Video3Minify: 0x%08X.\n", Swov->Video->Video3Minify);
-    ViaDebug(Swov->scrnIndex, "Video3ColorSpace1: 0x%08X.\n", Swov->Video->Video3ColorSpace1);
-    ViaDebug(Swov->scrnIndex, "Video3ColorSpace2: 0x%08X.\n", Swov->Video->Video3ColorSpace2);
-    ViaDebug(Swov->scrnIndex, "Video3DisplayTemp: 0x%08X.\n", Swov->Video->Video3DisplayTemp);
-    ViaDebug(Swov->scrnIndex, "Video3AlphaFifo: 0x%08X.\n", Swov->Video->Video3AlphaFifo);
-    ViaDebug(Swov->scrnIndex, "Video3AlphaPreFifo: 0x%08X.\n", Swov->Video->Video3AlphaPreFifo);
-    ViaDebug(Swov->scrnIndex, "Video3Address0: 0x%08X.\n", Swov->Video->Video3Address0);
-    ViaDebug(Swov->scrnIndex, "Video3Address1: 0x%08X.\n", Swov->Video->Video3Address1);
-    ViaDebug(Swov->scrnIndex, "Video3Address2: 0x%08X.\n", Swov->Video->Video3Address2);
-
-    ViaDebug(Swov->scrnIndex, "HQV Map:\n");
-
-    ViaDebug(Swov->scrnIndex, "Control: 0x%08X.\n", Swov->HQV->Control);
-    ViaDebug(Swov->scrnIndex, "SrcAddressY: 0x%08X.\n", Swov->HQV->SrcAddressY);
-    ViaDebug(Swov->scrnIndex, "SrcAddressU: 0x%08X.\n", Swov->HQV->SrcAddressU);
-    ViaDebug(Swov->scrnIndex, "SrcAddressV: 0x%08X.\n", Swov->HQV->SrcAddressV);
-    ViaDebug(Swov->scrnIndex, "SrcFetch: 0x%08X.\n", Swov->HQV->SrcFetch);
-    ViaDebug(Swov->scrnIndex, "Filter: 0x%08X.\n", Swov->HQV->Filter);
-    ViaDebug(Swov->scrnIndex, "Minify: 0x%08X.\n", Swov->HQV->Minify);
-    ViaDebug(Swov->scrnIndex, "DstAddress0: 0x%08X.\n", Swov->HQV->DstAddress0);
-    ViaDebug(Swov->scrnIndex, "DstAddress1: 0x%08X.\n", Swov->HQV->DstAddress1);
-    ViaDebug(Swov->scrnIndex, "DstStride: 0x%08X.\n", Swov->HQV->DstStride);
-    ViaDebug(Swov->scrnIndex, "SrcStride: 0x%08X.\n", Swov->HQV->SrcStride);
-    ViaDebug(Swov->scrnIndex, "DstAddress2: 0x%08X.\n", Swov->HQV->DstAddress2);
-}
-
-/*
  * There was no via_drm.h versioning so we were forced to revert to using
  * defines directly...
  */
@@ -2498,9 +2408,6 @@ ViaSwovInit(ScrnInfoPtr pScrn)
     Swov->Video = (struct ViaVideoRegs *) (pVia->MapBase + 0x200);
     Swov->HQV = (struct ViaHQVRegs *) (pVia->MapBase + 0x3D0);
 
-    if (pVia->PrintSwovRegs)
-        ViaSwovPrintRegs(Swov, __func__);
-
     /* old HWDiff stuff */
     switch(pVia->Chipset) {
     case VT3122: