XLibre/xf86-video-xgi
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-xgi.git synced 2026-03-24 01:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate numerous unused TV related structure fields and options.

Browse Source
This commit is contained in:
Ian Romanick
2006-11-17 14:50:59 -08:00
parent 215d4276f9
commit 61a8290c8f
3 changed files with 0 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/xgi.h
View File

@@ -622,15 +622,7 @@ typedef struct {
int VESA;
int ForceCRT1Type;
int ForceCRT2Type;
/**
* \bug This field is set but never used.
*/
int OptTVStand;
int OptTVOver;
int OptROMUsage;
int UseCHOverScan;
Bool ValidWidth;
/**
@@ -845,43 +837,6 @@ typedef struct {
Bool noInternalModes;
int OptUseOEM; /* Use internal OEM data? */
/**
* \bug These fields are set but never used.
*/
int chtvlumabandwidthcvbs; /* TV settings for Chrontel TV encoder */
int chtvlumabandwidthsvideo;
int chtvlumaflickerfilter;
int chtvchromabandwidth;
int chtvchromaflickerfilter;
int chtvcvbscolor;
int chtvtextenhance;
int chtvcontrast;
int chtvtype;
int xgitvedgeenhance; /* TV settings for bridges */
int xgitvantiflicker;
int xgitvsaturation;
int xgitvcolcalibc;
int xgitvcolcalibf;
int xgitvcfilter;
int xgitvyfilter;
int OptTVSOver; /* Chrontel 7005: Superoverscan */
int tvxpos, tvypos;
int tvxscale, tvyscale;
/**
* 6326 TV settings
*
* \bug These fields are set but never used.
*/
int XGI6326Flags;
int xgi6326enableyfilter;
int xgi6326yfilterstrong;
int xgi6326tvplug;
int xgi6326fscadjust;
int NoYV12; /* Disable Xv YV12 support (old series) */
int newFastVram; /* Replaces FastVram */
int ForceTVType, SenseYPbPr;
int NonDefaultPAL, NonDefaultNTSC;

40
src/xgi_driver.c
View File

@@ -2506,8 +2506,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
PDEBUG(ErrorF(" --- Chipset : %s \n", pScrn->chipset));
pXGI->XGI6326Flags = 0;
/*
* This shouldn't happen because such problems should be caught in
* XGIProbe(), but check it just in case.
@@ -2669,7 +2667,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
#endif
memset(pXGI->XGI_Pr, 0, sizeof(XGI_Private));
pXGI->XGI_Pr->XGI_Backup70xx = 0xff;
pXGI->XGI_Pr->XGI_CHOverScan = -1;
pXGI->XGI_Pr->XGI_ChSW = FALSE;
pXGI->XGI_Pr->XGI_CustomT = CUT_NONE;
pXGI->XGI_Pr->PanelSelfDetected = FALSE;
@@ -3330,34 +3327,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
#ifdef XGI_CP
XGI_CP_DRIVER_RECONFIGOPT
#endif
PDEBUG(ErrorF("3629 pXGI->VBFlags =%x\n",pXGI->VBFlags)) ;
/* Do some checks */
if(pXGI->OptTVOver != -1)
{
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"CHTVOverscan only supported on CHRONTEL 70xx\n");
pXGI->UseCHOverScan = -1;
}
else pXGI->UseCHOverScan = -1;
if(pXGI->xgitvedgeenhance != -1)
{
if(!(pXGI->XGI_Pr->XGI_VBType & VB_XGI301))
{
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"XGITVEdgeEnhance only supported on XGI301\n");
pXGI->xgitvedgeenhance = -1;
}
}
if(pXGI->xgitvsaturation != -1)
{
if(pXGI->XGI_Pr->XGI_VBType & VB_XGI301)
{
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"XGITVSaturation not supported on XGI301\n");
pXGI->xgitvsaturation = -1;
}
}
/* Do some MergedFB mode initialisation */
#ifdef XGIMERGED
@@ -6640,15 +6609,6 @@ PDEBUG(ErrorF("VBFlags=0x%lx\n", pXGI->VBFlags));
}
CR31 &= ~0x04; /* Clear NotSimuMode */
pXGI->XGI_Pr->XGI_CHOverScan = pXGI->UseCHOverScan;
if((pXGI->OptTVSOver == 1) && (pXGI->ChrontelType == CHRONTEL_700x))
{
pXGI->XGI_Pr->XGI_CHSOverScan = TRUE;
}
else
{
pXGI->XGI_Pr->XGI_CHSOverScan = FALSE;
}
#ifdef XGI_CP
XGI_CP_DRIVER_CONFIG
#endif

134
src/xgi_opt.c
View File

@@ -69,38 +69,9 @@ typedef enum {
OPTION_PDCA,
OPTION_PDCS,
OPTION_PDCAS,
OPTION_TVSTANDARD,
OPTION_USEROMDATA,
OPTION_NOINTERNALMODES,
OPTION_USEOEM,
OPTION_NOYV12,
OPTION_CHTVOVERSCAN,
OPTION_CHTVSOVERSCAN,
OPTION_CHTVLUMABANDWIDTHCVBS,
OPTION_CHTVLUMABANDWIDTHSVIDEO,
OPTION_CHTVLUMAFLICKERFILTER,
OPTION_CHTVCHROMABANDWIDTH,
OPTION_CHTVCHROMAFLICKERFILTER,
OPTION_CHTVCVBSCOLOR,
OPTION_CHTVTEXTENHANCE,
OPTION_CHTVCONTRAST,
OPTION_XGITVEDGEENHANCE,
OPTION_XGITVANTIFLICKER,
OPTION_XGITVSATURATION,
OPTION_XGITVCHROMAFILTER,
OPTION_XGITVLUMAFILTER,
OPTION_XGITVCOLCALIBFINE,
OPTION_XGITVCOLCALIBCOARSE,
OPTION_TVXPOSOFFSET,
OPTION_TVYPOSOFFSET,
OPTION_TVXSCALE,
OPTION_TVYSCALE,
OPTION_XGI6326ANTIFLICKER,
OPTION_XGI6326ENABLEYFILTER,
OPTION_XGI6326YFILTERSTRONG,
OPTION_XGI6326FORCETVPPLUG,
OPTION_XGI6326FSCADJUST,
OPTION_CHTVTYPE,
OPTION_USERGBCURSOR,
OPTION_USERGBCURSORBLEND,
OPTION_USERGBCURSORBLENDTH,
@@ -177,38 +148,9 @@ static const OptionInfoRec XGIOptions[] = {
{ OPTION_PDCAS, "PDC1", OPTV_INTEGER, {0}, -1 },
{ OPTION_LVDSHL, "LVDSHL", OPTV_INTEGER, {0}, -1 },
{ OPTION_SPECIALTIMING, "SpecialTiming", OPTV_STRING, {0}, -1 },
{ OPTION_TVSTANDARD, "TVStandard", OPTV_STRING, {0}, -1 },
{ OPTION_USEROMDATA, "UseROMData", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_NOINTERNALMODES, "NoInternalModes", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_USEOEM, "UseOEMData", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_NOYV12, "NoYV12", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_CHTVTYPE, "CHTVType", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_CHTVOVERSCAN, "CHTVOverscan", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_CHTVSOVERSCAN, "CHTVSuperOverscan", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_CHTVLUMABANDWIDTHCVBS, "CHTVLumaBandwidthCVBS", OPTV_INTEGER, {0}, -1 },
{ OPTION_CHTVLUMABANDWIDTHSVIDEO, "CHTVLumaBandwidthSVIDEO",OPTV_INTEGER, {0}, -1 },
{ OPTION_CHTVLUMAFLICKERFILTER, "CHTVLumaFlickerFilter", OPTV_INTEGER, {0}, -1 },
{ OPTION_CHTVCHROMABANDWIDTH, "CHTVChromaBandwidth", OPTV_INTEGER, {0}, -1 },
{ OPTION_CHTVCHROMAFLICKERFILTER, "CHTVChromaFlickerFilter",OPTV_INTEGER, {0}, -1 },
{ OPTION_CHTVCVBSCOLOR, "CHTVCVBSColor", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_CHTVTEXTENHANCE, "CHTVTextEnhance", OPTV_INTEGER, {0}, -1 },
{ OPTION_CHTVCONTRAST, "CHTVContrast", OPTV_INTEGER, {0}, -1 },
{ OPTION_XGITVEDGEENHANCE, "XGITVEdgeEnhance", OPTV_INTEGER, {0}, -1 },
{ OPTION_XGITVANTIFLICKER, "XGITVAntiFlicker", OPTV_STRING, {0}, FALSE },
{ OPTION_XGITVSATURATION, "XGITVSaturation", OPTV_INTEGER, {0}, -1 },
{ OPTION_XGITVCHROMAFILTER, "XGITVCFilter", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XGITVLUMAFILTER, "XGITVYFilter", OPTV_INTEGER, {0}, -1 },
{ OPTION_XGITVCOLCALIBFINE, "XGITVColorCalibFine", OPTV_INTEGER, {0}, -1 },
{ OPTION_XGITVCOLCALIBCOARSE, "XGITVColorCalibCoarse", OPTV_INTEGER, {0}, -1 },
{ OPTION_TVXSCALE, "XGITVXScale", OPTV_INTEGER, {0}, -1 },
{ OPTION_TVYSCALE, "XGITVYScale", OPTV_INTEGER, {0}, -1 },
{ OPTION_TVXPOSOFFSET, "TVXPosOffset", OPTV_INTEGER, {0}, -1 },
{ OPTION_TVYPOSOFFSET, "TVYPosOffset", OPTV_INTEGER, {0}, -1 },
{ OPTION_XGI6326ANTIFLICKER, "XGI6326TVAntiFlicker", OPTV_STRING, {0}, FALSE },
{ OPTION_XGI6326ENABLEYFILTER, "XGI6326TVEnableYFilter", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XGI6326YFILTERSTRONG, "XGI6326TVYFilterStrong", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XGI6326FORCETVPPLUG, "XGI6326TVForcePlug", OPTV_STRING, {0}, -1 },
{ OPTION_XGI6326FSCADJUST, "XGI6326FSCAdjust", OPTV_INTEGER, {0}, -1 },
{ OPTION_USERGBCURSOR, "UseColorHWCursor", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_USERGBCURSORBLEND, "ColorHWCursorBlending", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_USERGBCURSORBLENDTH, "ColorHWCursorBlendThreshold", OPTV_INTEGER,{0},-1 },
@@ -308,40 +250,12 @@ xgiOptions(ScrnInfoPtr pScrn)
pXGI->forceCRT1 = -1;
pXGI->DSTN = FALSE;
pXGI->FSTN = FALSE;
pXGI->NoYV12 = -1;
pXGI->PDC = -1;
pXGI->PDCA = -1;
pXGI->OptTVStand = -1;
pXGI->OptROMUsage = -1;
pXGI->noInternalModes = FALSE;
pXGI->OptUseOEM = -1;
pXGI->OptTVOver = -1;
pXGI->OptTVSOver = -1;
pXGI->chtvlumabandwidthcvbs = -1;
pXGI->chtvlumabandwidthsvideo = -1;
pXGI->chtvlumaflickerfilter = -1;
pXGI->chtvchromabandwidth = -1;
pXGI->chtvchromaflickerfilter = -1;
pXGI->chtvcvbscolor = -1;
pXGI->chtvtextenhance = -1;
pXGI->chtvcontrast = -1;
pXGI->xgitvedgeenhance = -1;
pXGI->xgitvantiflicker = -1;
pXGI->xgitvsaturation = -1;
pXGI->xgitvcfilter = -1;
pXGI->xgitvyfilter = 1; /* 0 = off, 1 = default, 2-8 = filter no */
pXGI->xgitvcolcalibc = 0;
pXGI->xgitvcolcalibf = 0;
pXGI->xgi6326enableyfilter = -1;
pXGI->xgi6326yfilterstrong = -1;
pXGI->xgi6326tvplug = -1;
pXGI->xgi6326fscadjust = 0;
pXGI->tvxpos = 0;
pXGI->tvypos = 0;
pXGI->tvxscale = 0;
pXGI->tvyscale = 0;
pXGI->NonDefaultPAL = pXGI->NonDefaultNTSC = -1;
pXGI->chtvtype = -1;
pXGI->restorebyset = TRUE;
pXGI->nocrt2ddcdetection = FALSE;
pXGI->forcecrt2redetection = TRUE; /* default changed since 13/09/2003 */
@@ -543,40 +457,6 @@ xgiOptions(ScrnInfoPtr pScrn)
if(xf86GetOptValString(pXGI->Options, OPTION_LVDSHL)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "LVDSHL");
}
if(xf86GetOptValString(pXGI->Options, OPTION_TVSTANDARD)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "TVStandard");
}
if(xf86GetOptValString(pXGI->Options, OPTION_CHTVTYPE)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "CHTVType");
}
if(xf86GetOptValBool(pXGI->Options, OPTION_CHTVOVERSCAN, &val)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "CHTVOverscan");
}
if(xf86GetOptValBool(pXGI->Options, OPTION_CHTVSOVERSCAN, &val)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "CHTVSuperOverscan");
}
if((xf86GetOptValInteger(pXGI->Options, OPTION_CHTVLUMABANDWIDTHCVBS, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_CHTVLUMABANDWIDTHSVIDEO, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_CHTVLUMAFLICKERFILTER, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_CHTVCHROMABANDWIDTH, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_CHTVCHROMAFLICKERFILTER, &vali)) ||
(xf86GetOptValBool(pXGI->Options, OPTION_CHTVCVBSCOLOR, &val)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_CHTVTEXTENHANCE, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_CHTVCONTRAST, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_XGITVEDGEENHANCE, &vali)) ||
(xf86GetOptValString(pXGI->Options, OPTION_XGITVANTIFLICKER)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_XGITVSATURATION, &vali)) ||
(xf86GetOptValBool(pXGI->Options, OPTION_XGITVCHROMAFILTER, &val)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_XGITVLUMAFILTER, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_XGITVCOLCALIBCOARSE, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_XGITVCOLCALIBFINE, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_TVXPOSOFFSET, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_TVYPOSOFFSET, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_TVXSCALE, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_TVYSCALE, &vali))) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"TV related options are only accepted in Master Head's device section");
}
if(xf86GetOptValBool(pXGI->Options, OPTION_CRT2GAMMA, &val)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "CRT2Gamma");
}
@@ -717,20 +597,6 @@ xgiOptions(ScrnInfoPtr pScrn)
Bool val;
int tmp;
if((pXGI->VGAEngine == XGI_OLD_VGA) || (pXGI->VGAEngine == XGI_530_VGA)) {
/* NoYV12 (for 5597/5598, 6326 and 530/620 only)
* YV12 has problems with videos larger than 384x288. So
* allow the user to disable YV12 support to force the
* application to use YUV2 instead.
*/
if(xf86GetOptValBool(pXGI->Options, OPTION_NOYV12, &val)) {
pXGI->NoYV12 = val ? 1 : 0;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Xv YV12/I420 support is %s\n",
pXGI->NoYV12 ? disabledstr : enabledstr);
}
}
/* Some Xv properties' defaults can be set by options */
if(xf86GetOptValInteger(pXGI->Options, OPTION_XVDEFCONTRAST, &tmp)) {
if((tmp >= 0) && (tmp <= 7)) pXGI->XvDefCon = tmp;