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 several unused structure fields.

Browse Source 
Eliminate all occurances of CRT1changed, detectedCRT2Devices,
UsePanelScaler, and CenterLCD.
This commit is contained in:
Ian Romanick
2006-11-17 15:07:30 -08:00
parent 61a8290c8f
commit 3919aed883
3 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/xgi.h
View File

@@ -630,11 +630,6 @@ typedef struct {
*/
int forceCRT1;
/**
* \bug This field is set but never used.
*/
Bool CRT1changed;
unsigned char myCR63;
unsigned char newCR32;
unsigned long VBFlags; /* Video bridge configuration */
@@ -822,13 +817,6 @@ typedef struct {
CARD32 CmdQueLenFix; /* Fix value to subtract from QueLen (530/620) */
CARD32 CmdQueMaxLen; /* (6326/5597/5598) Amount of cmds the queue can hold */
/**
* Detected CRT2 devices before mask-out
*
* \bug This field is set but never used.
*/
CARD32 detectedCRT2Devices;
/**
* Use our own default modes?
*
@@ -883,7 +871,6 @@ typedef struct {
BOOLEAN disablecolorkeycurrent;
CARD32 colorKey;
CARD32 MiscFlags;
int UsePanelScaler, CenterLCD;
FBLinearPtr AccelLinearScratch;
float zClearVal;
unsigned long bClrColor, dwColor;

9
src/xgi_driver.c
View File

@@ -3208,8 +3208,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
/* Detect CRT2-VGA */
XGICRT2PreInit(pScrn);
PDEBUG(ErrorF("3496 pXGI->VBFlags =%x\n",pXGI->VBFlags)) ;
/* Backup detected CRT2 devices */
pXGI->detectedCRT2Devices = pXGI->VBFlags & (CRT2_LCD|CRT2_TV|CRT2_VGA|TV_AVIDEO|TV_SVIDEO|TV_SCART|TV_HIVISION|TV_YPBPR);
if(!(pXGI->XGI_SD_Flags & XGI_SD_SUPPORTYPBPR))
{
@@ -3292,10 +3290,9 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
}
}
/* Handle ForceCRT1 option (part 2) */
pXGI->CRT1changed = FALSE;
/* Check if CRT1 used or needed. There are three cases where this can
/* Handle ForceCRT1 option (part 2)
*
* Check if CRT1 used or needed. There are three cases where this can
* happen:
* - No video bridge.
* - No CRT2 output.

10
src/xgi_opt.c
View File

@@ -176,8 +176,6 @@ static const OptionInfoRec XGIOptions[] = {
{ OPTION_XVYUVCHROMAKEY, "XvYUVChromaKey", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XVDISABLECOLORKEY, "XvDisableColorKey", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_XVMEMCPY, "XvUseMemcpy", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_SCALELCD, "ScaleLCD", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_CENTERLCD, "CenterLCD", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_ENABLEHOTKEY, "EnableHotkey", OPTV_BOOLEAN, {0}, -1 },
{ OPTION_ENABLEXGICTRL, "EnableXGICtrl", OPTV_BOOLEAN, {0}, -1 },
#ifdef XGIMERGED
@@ -278,8 +276,6 @@ xgiOptions(ScrnInfoPtr pScrn)
pXGI->XvDefSat = 0;
pXGI->XvDefDisableGfx = FALSE;
pXGI->XvDefDisableGfxLR = FALSE;
pXGI->UsePanelScaler = -1;
pXGI->CenterLCD = -1;
pXGI->XvUseMemcpy = TRUE;
pXGI->XvUseChromaKey = FALSE;
pXGI->XvDisableColorKey = FALSE;
@@ -437,12 +433,6 @@ xgiOptions(ScrnInfoPtr pScrn)
if(xf86GetOptValString(pXGI->Options, OPTION_YPBPRAR)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "YPbPrAspectRatio");
}
if(xf86GetOptValBool(pXGI->Options, OPTION_SCALELCD, &val)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "ScaleLCD");
}
if(xf86GetOptValBool(pXGI->Options, OPTION_CENTERLCD, &val)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "CenterLCD");
}
if((xf86GetOptValInteger(pXGI->Options, OPTION_PDC, &vali)) ||
(xf86GetOptValInteger(pXGI->Options, OPTION_PDCS, &vali))) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "PanelDelayCompensation (PDC)");