OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: xgifb: delete duplicated TV data tables 

Delete redundant TV data tables. Replace as follows:

	XGI_EPLCHTVDataPtr	==> xgifb_chrontel_tv
	XGI_EPLCHTVRegPtr	==> xgifb_chrontel_tv

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-08-31 21:46:09 +03:00 committed by Greg Kroah-Hartman
parent cc5c2aeb23
commit 0c23b6d2fe
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/xgifb/vb_setmode.c
View File

@ -2325,7 +2325,8 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo,
tempdi = NULL; /*EPLCHTVCRT1Ptr_V;*/
break;
case 2:
tempdi = XGI_EPLCHTVDataPtr;
case 6:
tempdi = xgifb_chrontel_tv;
break;
case 3:
tempdi = NULL;
@ -2336,9 +2337,6 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo,
case 5:
tempdi = NULL;
break;
case 6:
tempdi = XGI_EPLCHTVRegPtr;
break;
default:
break;
}

21
drivers/staging/xgifb/vb_table.h
View File

@ -2476,21 +2476,12 @@ static struct XGI330_TVDataTablStruct XGI_TVDataTable[] = {
{0xffff, 0x0000, 12} /* END */
};
/* ;;Chrontel 7017 TV Timing List */
static struct XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[] = {
{0x0011, 0x0000, 0}, /* XGI_CHTVUNTSCData */
{0x0011, 0x0010, 1}, /* XGI_CHTVONTSCData */
{0x0011, 0x0001, 2}, /* XGI_CHTVUPALData */
{0x0011, 0x0011, 3}, /* XGI_CHTVOPALData */
{0xFFFF, 0x0000, 4}
};
/* ;;Chrontel 7017 TV Reg. List */
static struct XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[] = {
{0x0011, 0x0000, 0}, /* XGI_CHTVRegUNTSC */
{0x0011, 0x0010, 1}, /* XGI_CHTVRegONTSC */
{0x0011, 0x0001, 2}, /* XGI_CHTVRegUPAL */
{0x0011, 0x0011, 3}, /* XGI_CHTVRegOPAL */
/* 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}
};