redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: xgifb: delete IF_DEF_VideoCapture 

Delete already disabled code paths.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
hifive-unleashed-5.1
Aaro Koskinen 2011-08-31 21:46:11 +03:00 committed by Greg Kroah-Hartman
parent 11fbdcde54
commit d2de85c5da
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/xgifb/vb_def.h
View File

@ -148,7 +148,6 @@
#define SetCRT2ToDualEdge 0x8000
#define ProgrammingCRT2 0x0001 /* Set Flag */
#define EnableVCMode 0x0002
#define ReserveTVOption 0x0008
#define Win9xDOSMode 0x0020
#define GatingCRT 0x0800

29
drivers/staging/xgifb/vb_setmode.c
View File

@ -3379,34 +3379,6 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
tempbx |= (SetInSlaveMode |
SetSimuScanMode);
}
if (pVBInfo->IF_DEF_VideoCapture == 1) {
if (((HwDeviceExtension->jChipType ==
XG40) &&
(pVBInfo->Set_VGAType == XG40)) ||
((HwDeviceExtension->jChipType ==
XG41) &&
(pVBInfo->Set_VGAType == XG41)) ||
((HwDeviceExtension->jChipType ==
XG42) &&
(pVBInfo->Set_VGAType == XG42)) ||
((HwDeviceExtension->jChipType ==
XG45) &&
(pVBInfo->Set_VGAType == XG45))) {
if (ModeNo <= 13) {
if (!(tempbx &
SetCRT2ToRAMDAC)) {
/*CRT2 not need
* to support*/
tempbx &=
(0x00FF |
(~SetInSlaveMode));
pVBInfo->SetFlag
|= EnableVCMode;
}
}
}
}
}
/* LCD+TV can't support in slave mode
@ -7878,7 +7850,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
pVBInfo->IF_DEF_LVDS = 0;
pVBInfo->IF_DEF_LCDA = 1;
pVBInfo->IF_DEF_VideoCapture = 0;
pVBInfo->IF_DEF_ScaleLCD = 0;
pVBInfo->IF_DEF_OEMUtil = 0;
pVBInfo->IF_DEF_PWD = 0;

2
drivers/staging/xgifb/vb_struct.h
View File

@ -288,7 +288,7 @@ struct vb_device_info {
unsigned short ModeType;
/* ,IF_DEF_FSTN; add for dstn */
unsigned short IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;
unsigned short IF_DEF_CRT2Monitor, IF_DEF_VideoCapture;
unsigned short IF_DEF_CRT2Monitor;
unsigned short IF_DEF_LCDA, IF_DEF_YPbPr,
IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD;
unsigned short IF_DEF_ExpLink;