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

Commit 0c23b6d2 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cc5c2aeb

drivers/staging/xgifb/vb_setmode.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

	}

drivers/staging/xgifb/vb_table.h

+6 −15
Original line number Diff line number Diff line
@@ -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}

};