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

Commit 4c14bfd4 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: delete support for Chrontel 7005 TV output 



IF_DEF_CH7005 is hard-coded to 0, so this is all just dead code that
can be deleted.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a35cd0ba

drivers/staging/xgifb/vb_setmode.c

+9 −67
Original line number Diff line number Diff line
@@ -487,11 +487,6 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, 
			}

		}

	} else { /* for LVDS */

		if (pVBInfo->IF_DEF_CH7005 == 1) {

			if (pVBInfo->VBInfo & SetCRT2ToTV)

				tempax |= SupportCHTV;

		}



		if (pVBInfo->VBInfo & SetCRT2ToLCD) {

			tempax |= SupportLCD;
@@ -1333,8 +1328,6 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 
		struct xgi_hw_device_info *HwDeviceExtension,

		struct vb_device_info *pVBInfo)

{

	unsigned short tempbx;



	unsigned short LCDXlat1VCLK[4] = { VCLK65 + 2,

					   VCLK65 + 2,

					   VCLK65 + 2,
@@ -1355,7 +1348,6 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 


	unsigned short CRT2Index, VCLKIndex;

	unsigned short modeflag, resinfo;

	unsigned char *CHTVVCLKPtr = NULL;



	if (ModeNo <= 0x13) {

		/* si+St_ResInfo */
@@ -1456,37 +1448,6 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 
		else

			VCLKIndex = CRT2Index;



		if (pVBInfo->IF_DEF_CH7005 == 1) {

			if (!(pVBInfo->VBInfo & SetCRT2ToLCD)) {

				VCLKIndex &= 0x1f;

				tempbx = 0;



				if (pVBInfo->VBInfo & SetPALTV)

					tempbx += 2;



				if (pVBInfo->VBInfo & SetCHTVOverScan)

					tempbx += 1;



				switch (tempbx) {

				case 0:

					CHTVVCLKPtr = pVBInfo->CHTVVCLKUNTSC;

					break;

				case 1:

					CHTVVCLKPtr = pVBInfo->CHTVVCLKONTSC;

					break;

				case 2:

					CHTVVCLKPtr = pVBInfo->CHTVVCLKUPAL;

					break;

				case 3:

					CHTVVCLKPtr = pVBInfo->CHTVVCLKOPAL;

					break;

				default:

					break;

				}



				VCLKIndex = CHTVVCLKPtr[VCLKIndex];

			}

		} else {

		VCLKIndex = VCLKIndex >> 6;

		if ((pVBInfo->LCDResInfo == Panel800x600) ||

		    (pVBInfo->LCDResInfo == Panel320x480))
@@ -1497,7 +1458,6 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 
		else

			VCLKIndex = LVDSXlat3VCLK[VCLKIndex];

	}

	}

	/* VCLKIndex = VCLKIndex&IndexMask; */



	return VCLKIndex;
@@ -4934,11 +4894,6 @@ static void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, 
	tempcx = (pVBInfo->VGAVT - 1);

	temp = tempcx & 0x00FF;



	if (pVBInfo->IF_DEF_CH7005 == 1) {

		if (pVBInfo->VBInfo & 0x0C)

			temp--;

	}



	xgifb_reg_set(pVBInfo->Part1Port, 0x0E, temp);

	tempbx = pVBInfo->VGAVDE - 1;

	temp = tempbx & 0x00FF;
@@ -8017,13 +7972,6 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, 
	else

		modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;



	if (pVBInfo->IF_DEF_CH7005 == 1) {

		if (pVBInfo->VBInfo & SetCRT2ToTV) {

			if (modeflag & HalfDCLK)

				return 0;

		}

	}



	if (ModeNo < 0x14)

		return 0xFFFF;
@@ -8038,11 +7986,6 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, 
		index--;



	if (pVBInfo->SetFlag & ProgrammingCRT2) {

		if (pVBInfo->IF_DEF_CH7005 == 1) {

			if (pVBInfo->VBInfo & SetCRT2ToTV)

				index = 0;

		}



		if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {

			if (pVBInfo->IF_DEF_LVDS == 0) {

				if (pVBInfo->VBType & (VB_XGI301B | VB_XGI302B
@@ -8551,7 +8494,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, 
	pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;

	pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;

	pVBInfo->IF_DEF_LVDS = 0;

	pVBInfo->IF_DEF_CH7005 = 0;

	pVBInfo->IF_DEF_LCDA = 1;

	pVBInfo->IF_DEF_CH7007 = 0; /* [Billy] 2007/05/14 */

	pVBInfo->IF_DEF_VideoCapture = 0;

drivers/staging/xgifb/vb_struct.h

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ struct vb_device_info { 
	unsigned short   IF_DEF_LCDA, IF_DEF_YPbPr,

			 IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD;

	unsigned short   IF_DEF_ExpLink;

	unsigned short   IF_DEF_CH7005, IF_DEF_HiVision;

	unsigned short   IF_DEF_HiVision;

	unsigned short   IF_DEF_CH7007; /* Billy 2007/05/03 */

	unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/

	unsigned short   VBInfo, TVInfo, LCDInfo, Set_VGAType;