Commit 1cccd9e4 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: constify Tap4 data 



Make Tap4 data const and adjust functions accordingly.

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

drivers/staging/xgifb/vb_setmode.c

+4 −6
Original line number Diff line number Diff line
@@ -4148,12 +4148,11 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, 
/* Output : di -> Tap4 Reg. Setting Pointer */

/* Description : */

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

static struct XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx,

		struct vb_device_info *pVBInfo)

static struct XGI301C_Tap4TimingStruct const

*XGI_GetTap4Ptr(unsigned short tempcx, struct vb_device_info *pVBInfo)

{

	unsigned short tempax, tempbx, i;



	struct XGI301C_Tap4TimingStruct *Tap4TimingPtr;

	struct XGI301C_Tap4TimingStruct const *Tap4TimingPtr;



	if (tempcx == 0) {

		tempax = pVBInfo->VGAHDE;
@@ -4194,8 +4193,7 @@ static struct XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx, 
static void XGI_SetTap4Regs(struct vb_device_info *pVBInfo)

{

	unsigned short i, j;



	struct XGI301C_Tap4TimingStruct *Tap4TimingPtr;

	struct XGI301C_Tap4TimingStruct const *Tap4TimingPtr;



	if (!(pVBInfo->VBType & VB_XGI301C))

		return;

drivers/staging/xgifb/vb_table.h

+4 −4
Original line number Diff line number Diff line
@@ -2421,7 +2421,7 @@ static unsigned char XGI_NTSC1024AdjTime[] = { 
	0x58, 0xe4, 0x73, 0xd0, 0x13

};



static struct XGI301C_Tap4TimingStruct xgifb_tap4_timing[] = {

static const struct XGI301C_Tap4TimingStruct xgifb_tap4_timing[] = {

	{0, {

	0x00, 0x20, 0x00, 0x00, 0x7F, 0x20, 0x02, 0x7F, /* ; C0-C7 */

	0x7D, 0x20, 0x04, 0x7F, 0x7D, 0x1F, 0x06, 0x7E, /* ; C8-CF */
@@ -2435,7 +2435,7 @@ static struct XGI301C_Tap4TimingStruct xgifb_tap4_timing[] = { 
	}

};



static struct XGI301C_Tap4TimingStruct PALTap4Timing[] = {

static const struct XGI301C_Tap4TimingStruct PALTap4Timing[] = {

	{600,	{

		0x05, 0x19, 0x05, 0x7D, 0x03, 0x19, 0x06, 0x7E, /* ; C0-C7 */

		0x02, 0x19, 0x08, 0x7D, 0x01, 0x18, 0x0A, 0x7D, /* ; C8-CF */
@@ -2471,7 +2471,7 @@ static struct XGI301C_Tap4TimingStruct PALTap4Timing[] = { 
	}

};



static struct XGI301C_Tap4TimingStruct xgifb_ntsc_525_tap4_timing[] = {

static const struct XGI301C_Tap4TimingStruct xgifb_ntsc_525_tap4_timing[] = {

	{480,	{

		0x04, 0x1A, 0x04, 0x7E, 0x03, 0x1A, 0x06, 0x7D, /* ; C0-C7 */

		0x01, 0x1A, 0x08, 0x7D, 0x00, 0x19, 0x0A, 0x7D, /* ; C8-CF */
@@ -2507,7 +2507,7 @@ static struct XGI301C_Tap4TimingStruct xgifb_ntsc_525_tap4_timing[] = { 
	}

};



static struct XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[] = {

static const struct XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[] = {

	{0xFFFF, {

		 0x05, 0x19, 0x05, 0x7D, 0x03, 0x19, 0x06, 0x7E, /* ; C0-C7 */

		 0x02, 0x19, 0x08, 0x7D, 0x01, 0x18, 0x0A, 0x7D, /* ; C8-CF */