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

Elminiate all occurances of forceCRT1.

Browse Source
This commit is contained in:
Ian Romanick
2006-11-17 17:09:47 -08:00
parent 4e615331df
commit d095ab57c7
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xgi.h
View File

@@ -624,12 +624,6 @@ typedef struct {
int ForceCRT2Type;
int OptROMUsage;
Bool ValidWidth;
/**
* \bug This field is set but never used.
*/
int forceCRT1;
unsigned char myCR63;
unsigned long VBFlags; /* Video bridge configuration */
unsigned long VBFlags_backup; /* Backup for SlaveMode-modes */

13
src/xgi_driver.c
View File

@@ -3073,14 +3073,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using %ldK of framebuffer memory\n",
pXGI->maxxfbmem / 1024);
/* Handle ForceCRT1 option */
if (pXGI->forceCRT1 != -1) {
pXGI->CRT1off = (pXGI->forceCRT1) ? 0 : 1;
}
else {
pXGI->CRT1off = -1;
}
pXGI->CRT1off = -1;
/* Detect video bridge and sense TV/VGA2 */
XGIVGAPreInit(pScrn);
@@ -3218,9 +3211,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
}
}
/* Handle ForceCRT1 option (part 2)
*
* Check if CRT1 used or needed. There are three cases where this can
/* Check if CRT1 used or needed. There are three cases where this can
* happen:
* - No video bridge.
* - No CRT2 output.

6
src/xgi_opt.c
View File

@@ -62,7 +62,6 @@ typedef enum {
OPTION_NOXVIDEO,
OPTION_VESA,
OPTION_MAXXFBMEM,
OPTION_FORCECRT1,
OPTION_PDC,
OPTION_PDCA,
OPTION_PDCS,
@@ -133,7 +132,6 @@ static const OptionInfoRec XGIOptions[] = {
{ OPTION_NOXVIDEO, "NoXvideo", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_VESA, "Vesa", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_MAXXFBMEM, "MaxXFBMem", OPTV_INTEGER, {0}, -1 },
{ OPTION_FORCECRT1, "ForceCRT1", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_PDC, "PanelDelayCompensation", OPTV_INTEGER, {0}, -1 },
{ OPTION_PDCA, "PanelDelayCompensation1",OPTV_INTEGER, {0}, -1 },
{ OPTION_PDCS, "PDC", OPTV_INTEGER, {0}, -1 },
@@ -231,7 +229,6 @@ xgiOptions(ScrnInfoPtr pScrn)
pXGI->VESA = -1;
pXGI->NoXvideo = FALSE;
pXGI->maxxfbmem = 0;
pXGI->forceCRT1 = -1;
pXGI->DSTN = FALSE;
pXGI->FSTN = FALSE;
pXGI->PDC = -1;
@@ -387,9 +384,6 @@ xgiOptions(ScrnInfoPtr pScrn)
if(xf86GetOptValBool(pXGI->Options, OPTION_USEOEM, &val)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "UseOEMData");
}
if(xf86GetOptValBool(pXGI->Options, OPTION_FORCECRT1, &val)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "ForceCRT1");
}
if(xf86GetOptValBool(pXGI->Options, OPTION_NODDCFORCRT2, &val)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "NoCRT2Detection");
}