Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/xgifb/vb_def.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 


#define ProgrammingCRT2     0x0001       /* Set Flag */

#define ReserveTVOption     0x0008

#define Win9xDOSMode        0x0020

#define GatingCRT           0x0800

#define DisableChB          0x1000

#define EnableChB           0x2000

drivers/staging/xgifb/vb_setmode.c

+216 −240
Original line number Diff line number Diff line
@@ -2612,7 +2612,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, 
	else

		modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;



	if (!(pVBInfo->SetFlag & Win9xDOSMode)) {

	if (pVBInfo->IF_DEF_OEMUtil == 1) {

		tempbx = 8;

		LCDPtr = (struct XGI330_LCDDataDesStruct *)
@@ -2890,7 +2889,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, 
	xgifb_reg_set(pVBInfo->Part1Port, 0x23,

			(unsigned short) (temp3 & 0xff));

}

}



/* --------------------------------------------------------------------- */

/* Function : XGI_GETLCDVCLKPtr */
@@ -3857,7 +3855,6 @@ static void XGI_WaitDisply(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);

}
@@ -6448,9 +6445,6 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, 
{

	unsigned short tempah = 0;



	if (pVBInfo->SetFlag == Win9xDOSMode)

		return;



	if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B | VB_XGI301LV

			| VB_XGI302LV | VB_XGI301C)) {

		tempah = 0x3F;
@@ -6988,9 +6982,6 @@ static void XGI_OEM310Setting(unsigned short ModeNo, 
			      unsigned short ModeIdIndex,

			      struct vb_device_info *pVBInfo)

{

	if (pVBInfo->SetFlag & Win9xDOSMode)

		return;



	/* GetPart1IO(); */

	XGI_SetDelayComp(pVBInfo);
@@ -7588,16 +7579,6 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, 
{

	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

			| VB_XGI302LV | VB_XGI301C)) {

		if (!(pVBInfo->SetFlag & DisableChA)) {
@@ -7698,11 +7679,6 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, 
		/* EnablePart4_1F */

		xgifb_reg_or(pVBInfo->Part4Port, 0x1F, tempah);



		if (pVBInfo->SetFlag & Win9xDOSMode) {

			XGI_DisplayOn(HwDeviceExtension, pVBInfo);

			return;

		}



		if (!(pVBInfo->SetFlag & DisableChA)) {

			XGI_VBLongWait(pVBInfo);

			if (!(pVBInfo->SetFlag & GatingCRT)) {