Commit 09cb8e50 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: delete Win9xDOSMode

Delete another useless flag.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d2de85c5
...@@ -149,7 +149,6 @@ ...@@ -149,7 +149,6 @@
#define ProgrammingCRT2 0x0001 /* Set Flag */ #define ProgrammingCRT2 0x0001 /* Set Flag */
#define ReserveTVOption 0x0008 #define ReserveTVOption 0x0008
#define Win9xDOSMode 0x0020
#define GatingCRT 0x0800 #define GatingCRT 0x0800
#define DisableChB 0x1000 #define DisableChB 0x1000
#define EnableChB 0x2000 #define EnableChB 0x2000
......
...@@ -2612,7 +2612,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -2612,7 +2612,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
else else
modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag; modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;
if (!(pVBInfo->SetFlag & Win9xDOSMode)) {
if (pVBInfo->IF_DEF_OEMUtil == 1) { if (pVBInfo->IF_DEF_OEMUtil == 1) {
tempbx = 8; tempbx = 8;
LCDPtr = (struct XGI330_LCDDataDesStruct *) LCDPtr = (struct XGI330_LCDDataDesStruct *)
...@@ -2889,7 +2888,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -2889,7 +2888,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
(unsigned short) ((temp3 >> 8) & 0xff)); (unsigned short) ((temp3 >> 8) & 0xff));
xgifb_reg_set(pVBInfo->Part1Port, 0x23, xgifb_reg_set(pVBInfo->Part1Port, 0x23,
(unsigned short) (temp3 & 0xff)); (unsigned short) (temp3 & 0xff));
}
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
...@@ -3857,7 +3855,6 @@ static void XGI_WaitDisply(struct vb_device_info *pVBInfo) ...@@ -3857,7 +3855,6 @@ static void XGI_WaitDisply(struct vb_device_info *pVBInfo)
static void XGI_AutoThreshold(struct vb_device_info *pVBInfo) static void XGI_AutoThreshold(struct vb_device_info *pVBInfo)
{ {
if (!(pVBInfo->SetFlag & Win9xDOSMode))
xgifb_reg_or(pVBInfo->Part1Port, 0x01, 0x40); xgifb_reg_or(pVBInfo->Part1Port, 0x01, 0x40);
} }
...@@ -6448,9 +6445,6 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -6448,9 +6445,6 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension,
{ {
unsigned short tempah = 0; unsigned short tempah = 0;
if (pVBInfo->SetFlag == Win9xDOSMode)
return;
if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV
| VB_XGI302LV | VB_XGI301C)) { | VB_XGI302LV | VB_XGI301C)) {
tempah = 0x3F; tempah = 0x3F;
...@@ -6988,9 +6982,6 @@ static void XGI_OEM310Setting(unsigned short ModeNo, ...@@ -6988,9 +6982,6 @@ static void XGI_OEM310Setting(unsigned short ModeNo,
unsigned short ModeIdIndex, unsigned short ModeIdIndex,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
if (pVBInfo->SetFlag & Win9xDOSMode)
return;
/* GetPart1IO(); */ /* GetPart1IO(); */
XGI_SetDelayComp(pVBInfo); XGI_SetDelayComp(pVBInfo);
...@@ -7588,16 +7579,6 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -7588,16 +7579,6 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension,
{ {
unsigned short tempah; unsigned short tempah;
if (pVBInfo->SetFlag == Win9xDOSMode) {
if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV
| VB_XGI302LV | VB_XGI301C)) {
XGI_DisplayOn(HwDeviceExtension, pVBInfo);
return;
} else
/* LVDS or CH7017 */
return;
}
if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV
| VB_XGI302LV | VB_XGI301C)) { | VB_XGI302LV | VB_XGI301C)) {
if (!(pVBInfo->SetFlag & DisableChA)) { if (!(pVBInfo->SetFlag & DisableChA)) {
...@@ -7698,11 +7679,6 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -7698,11 +7679,6 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension,
/* EnablePart4_1F */ /* EnablePart4_1F */
xgifb_reg_or(pVBInfo->Part4Port, 0x1F, tempah); xgifb_reg_or(pVBInfo->Part4Port, 0x1F, tempah);
if (pVBInfo->SetFlag & Win9xDOSMode) {
XGI_DisplayOn(HwDeviceExtension, pVBInfo);
return;
}
if (!(pVBInfo->SetFlag & DisableChA)) { if (!(pVBInfo->SetFlag & DisableChA)) {
XGI_VBLongWait(pVBInfo); XGI_VBLongWait(pVBInfo);
if (!(pVBInfo->SetFlag & GatingCRT)) { if (!(pVBInfo->SetFlag & GatingCRT)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment