Skip to content

Commit

Permalink
staging: xgifb: delete IF_DEF_VideoCapture
Browse files Browse the repository at this point in the history
Delete already disabled code paths.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 11fbdcd commit d2de85c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 31 deletions.
1 change: 0 additions & 1 deletion drivers/staging/xgifb/vb_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@
#define SetCRT2ToDualEdge 0x8000

#define ProgrammingCRT2 0x0001 /* Set Flag */
#define EnableVCMode 0x0002
#define ReserveTVOption 0x0008
#define Win9xDOSMode 0x0020
#define GatingCRT 0x0800
Expand Down
29 changes: 0 additions & 29 deletions drivers/staging/xgifb/vb_setmode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/xgifb/vb_struct.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d2de85c

Please sign in to comment.