Removed unused driver options.

2 files changed, 0 insertions, 40 deletions

diff --git a/src/mga.h b/src/mga.h
index eb371e2..cd69931 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -44,12 +44,10 @@
 #endif
 
 typedef enum {
-    OPTION_SW_CURSOR,
     OPTION_HW_CURSOR,
     OPTION_PCI_RETRY,
     OPTION_SYNC_ON_GREEN,
     OPTION_NOACCEL,
-    OPTION_SHOWCACHE,
     OPTION_OVERLAY,
     OPTION_MGA_SDRAM,
     OPTION_SHADOW_FB,
@@ -59,24 +57,10 @@ typedef enum {
     OPTION_OVERCLOCK_MEM,
     OPTION_VIDEO_KEY,
     OPTION_TEXTURED_VIDEO,
-    OPTION_CRTC2HALF,
-    OPTION_CRTC2RAM,
     OPTION_INT10,
     OPTION_AGP_MODE,
     OPTION_AGP_SIZE,
-    OPTION_DIGITAL1,
-    OPTION_DIGITAL2,
-    OPTION_TV,
-    OPTION_TVSTANDARD,
-    OPTION_CABLETYPE,
-    OPTION_USEIRQZERO,
-    OPTION_SWAPPED_HEAD,
     OPTION_DRI,
-    OPTION_MERGEDFB,
-    OPTION_HSYNC2,
-    OPTION_VREFRESH2,
-    OPTION_MONITOR2POS,
-    OPTION_METAMODES,
     OPTION_OLDDMA,
     OPTION_PCIDMA,
     OPTION_ACCELMETHOD
@@ -402,7 +386,6 @@ typedef struct {
     Bool		Dac6Bit;
     Bool		HWCursor;
     Bool		UsePCIRetry;
-    Bool		ShowCache;
     Bool		Overlay8Plus24;
     Bool		ShadowFB;
     unsigned char *	ShadowPtr;
diff --git a/src/mga_driver.c b/src/mga_driver.c
index fef67df..d859e2e 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -198,12 +198,10 @@ static PciChipsets MGAPciChipsets[] = {
 };
 
 static const OptionInfoRec MGAOptions[] = {
-    { OPTION_SW_CURSOR,		"SWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_HW_CURSOR,		"HWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_PCI_RETRY,		"PciRetry",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_SYNC_ON_GREEN,	"SyncOnGreen",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_NOACCEL,		"NoAccel",	OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_SHOWCACHE,		"ShowCache",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_OVERLAY,		"Overlay",	OPTV_ANYSTR,	{0}, FALSE },
     { OPTION_MGA_SDRAM,		"MGASDRAM",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_SHADOW_FB,		"ShadowFB",	OPTV_BOOLEAN,	{0}, FALSE },
@@ -213,23 +211,10 @@ static const OptionInfoRec MGAOptions[] = {
     { OPTION_OVERCLOCK_MEM,	"OverclockMem",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_VIDEO_KEY,		"VideoKey",	OPTV_INTEGER,	{0}, FALSE },
     { OPTION_TEXTURED_VIDEO,	"TexturedVideo",OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_CRTC2HALF,		"Crtc2Half",	OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_CRTC2RAM,		"Crtc2Ram",	OPTV_INTEGER,	{0}, FALSE },
     { OPTION_INT10,		"Int10",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_AGP_MODE,		"AGPMode",	OPTV_INTEGER,	{0}, FALSE },
     { OPTION_AGP_SIZE,		"AGPSize",      OPTV_INTEGER,   {0}, FALSE },
-    { OPTION_DIGITAL1,		"DigitalScreen1",OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_DIGITAL2,		"DigitalScreen2",OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_TV,		"TV",		OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_TVSTANDARD,	"TVStandard",	OPTV_ANYSTR,	{0}, FALSE },
-    { OPTION_CABLETYPE,		"CableType",	OPTV_ANYSTR,	{0}, FALSE },
-    { OPTION_SWAPPED_HEAD,	"SwappedHead",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_DRI,		"DRI",		OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_MERGEDFB,		"MergedFB",	OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_HSYNC2,	"Monitor2HSync",	OPTV_ANYSTR,	{0}, FALSE },
-    { OPTION_VREFRESH2,	"Monitor2VRefresh",	OPTV_ANYSTR,	{0}, FALSE },
-    { OPTION_MONITOR2POS,   "Monitor2Position",	OPTV_ANYSTR,	{0}, FALSE },
-    { OPTION_METAMODES,   "MetaModes",  	OPTV_ANYSTR,	{0}, FALSE },
     { OPTION_OLDDMA,		"OldDmaInit",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_PCIDMA,		"ForcePciDma",	OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_ACCELMETHOD,	"AccelMethod",	OPTV_ANYSTR,	{0}, FALSE },
@@ -1455,10 +1440,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
 	pMga->SyncOnGreen = TRUE;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Sync-on-Green enabled\n");
     }
-    if (xf86ReturnOptValBool(pMga->Options, OPTION_SHOWCACHE, FALSE)) {
-	pMga->ShowCache = TRUE;
-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ShowCache enabled\n");
-    }
     if (xf86ReturnOptValBool(pMga->Options, OPTION_MGA_SDRAM, FALSE)) {
 	pMga->HasSDRAM = TRUE;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Has SDRAM\n");
@@ -1514,10 +1495,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
     if (xf86ReturnOptValBool(pMga->Options, OPTION_TEXTURED_VIDEO, FALSE)) {
 	pMga->TexturedVideo = TRUE;
     }
-    if (xf86ReturnOptValBool(pMga->Options, OPTION_MERGEDFB, FALSE)) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                   "\"Merged Framebuffer\" mode not supported.\n");
-    }
     if (pMga->FBDev) {
 	/* check for linux framebuffer device */
 	if (!xf86LoadSubModule(pScrn, "fbdevhw"))