Commit 6265ee4c authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: delete Chrontel TV data 



Delete unused Chrontel TV data.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56d276ca

drivers/staging/xgifb/vb_setmode.c

+4 −5
Original line number Diff line number Diff line
@@ -1770,12 +1770,10 @@ static void *XGI_GetTVPtr(unsigned short ModeNo, 
		struct vb_device_info *pVBInfo)

{

	unsigned short i, tempdx, tempal, modeflag;

	struct XGI330_TVDataTablStruct *tempdi = NULL;



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

	tempal = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;

	tempal = tempal & 0x3f;

	tempdi = XGI_TVDataTable;

	tempdx = pVBInfo->TVInfo;



	if (pVBInfo->VBInfo & SetInSlaveMode)
@@ -1786,13 +1784,14 @@ static void *XGI_GetTVPtr(unsigned short ModeNo, 


	i = 0;



	while (tempdi[i].MASK != 0xffff) {

		if ((tempdx & tempdi[i].MASK) == tempdi[i].CAP)

	while (XGI_TVDataTable[i].MASK != 0xffff) {

		if ((tempdx & XGI_TVDataTable[i].MASK) ==

			XGI_TVDataTable[i].CAP)

			break;

		i++;

	}



	switch (tempdi[i].DATAPTR) {

	switch (XGI_TVDataTable[i].DATAPTR) {

	case 0:

		return &XGI_ExtPALData[tempal];

		break;

drivers/staging/xgifb/vb_table.h

+0 −45
Original line number Diff line number Diff line
@@ -1501,42 +1501,6 @@ static struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[] = { 
	{0, 1328,   0,  771, 112, 6}  /* ; 0A (1280x768x75Hz) */

};



static struct SiS_LVDSData  XGI_CHTVUNTSCData[] = {

	{ 840, 600,  840, 600},

	{ 840, 600,  840, 600},

	{ 840, 600,  840, 600},

	{ 840, 600,  840, 600},

	{ 784, 600,  784, 600},

	{1064, 750, 1064, 750}

};



static struct SiS_LVDSData  XGI_CHTVONTSCData[] = {

	{ 840, 525,  840, 525},

	{ 840, 525,  840, 525},

	{ 840, 525,  840, 525},

	{ 840, 525,  840, 525},

	{ 784, 525,  784, 525},

	{1040, 700, 1040, 700}

};



static struct SiS_LVDSData  XGI_CHTVUPALData[] = {

	{1008, 625, 1008, 625},

	{1008, 625, 1008, 625},

	{1008, 625, 1008, 625},

	{1008, 625, 1008, 625},

	{ 840, 750,  840, 750},

	{ 936, 836,  936, 836}

};



static struct SiS_LVDSData  XGI_CHTVOPALData[] = {

	{1008, 625, 1008, 625},

	{1008, 625, 1008, 625},

	{1008, 625, 1008, 625},

	{1008, 625, 1008, 625},

	{840,  625,  840, 625},

	{960,  750,  960, 750}

};



/* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */

static struct XGI_LVDSCRT1HDataStruct  XGI_LVDSCRT11024x768_1_H[] = {

	{ {0x4B, 0x27, 0x8F, 0x32, 0x1B, 0x00, 0x45, 0x00} }, /* 00 (320x) */
@@ -1925,15 +1889,6 @@ static struct XGI330_TVDataTablStruct XGI_TVDataTable[] = { 
	{0xffff, 0x0000, 12}  /* END */

};



/* Chrontel 7017 TV List */

static struct XGI330_TVDataTablStruct xgifb_chrontel_tv[] = {

	{0x0011, 0x0000, 0}, /* UNTSC */

	{0x0011, 0x0010, 1}, /* ONTSC */

	{0x0011, 0x0001, 2}, /* UPAL */

	{0x0011, 0x0011, 3}, /* OPAL */

	{0xFFFF, 0x0000, 4}

};



static unsigned short LCDLenList[] = {

	LVDSCRT1Len_H,

	LVDSCRT1Len_V,