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

staging: xgifb: make remaining data tables const 



Remaining vb_table.h data can be trivially made const.

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

drivers/staging/xgifb/vb_setmode.c

+2 −2
Original line number Diff line number Diff line
@@ -5220,8 +5220,8 @@ static void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex, 
		struct vb_device_info *pVBInfo)

{

	unsigned short tempbx, index;



	unsigned char tempcl, tempch, tempal, *filterPtr;

	unsigned char const *filterPtr;

	unsigned char tempcl, tempch, tempal;



	XGI_GetTVPtrIndex2(&tempbx, &tempcl, &tempch, pVBInfo); /* bx, cl, ch */

drivers/staging/xgifb/vb_struct.h

+3 −3
Original line number Diff line number Diff line
@@ -158,10 +158,10 @@ struct vb_device_info { 
	void __iomem *FBAddr;

	unsigned long BaseAddr;



	unsigned char (*SR15)[8];

	unsigned char (*CR40)[8];

	unsigned char const (*SR15)[8];

	unsigned char const (*CR40)[8];



	struct SiS_MCLKData  *MCLKData;

	struct SiS_MCLKData const *MCLKData;



	unsigned char   *pXGINew_DRAMTypeDefinition;

	unsigned char   XGINew_CR97;

drivers/staging/xgifb/vb_table.h

+14 −14
Original line number Diff line number Diff line 
#ifndef _VB_TABLE_

#define _VB_TABLE_

static struct SiS_MCLKData XGI340New_MCLKData[] = {

static const struct SiS_MCLKData XGI340New_MCLKData[] = {

	{0x16, 0x01, 0x01, 166},

	{0x19, 0x02, 0x01, 124},

	{0x7C, 0x08, 0x01, 200},
@@ -11,7 +11,7 @@ static struct SiS_MCLKData XGI340New_MCLKData[] = { 
	{0x5c, 0x23, 0x01, 166}

};



static struct SiS_MCLKData XGI27New_MCLKData[] = {

static const struct SiS_MCLKData XGI27New_MCLKData[] = {

	{0x5c, 0x23, 0x01, 166},

	{0x19, 0x02, 0x01, 124},

	{0x7C, 0x08, 0x80, 200},
@@ -33,21 +33,21 @@ const struct XGI_ECLKDataStruct XGI340_ECLKData[] = { 
	{0x5c, 0x23, 0x01, 166}

};



static unsigned char XG27_SR13[4][8] = {

static const unsigned char XG27_SR13[4][8] = {

	{0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */

	{0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */

	{0x32, 0x32, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */

	{0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}  /* SR1B */

};



static unsigned char XGI340_SR13[4][8] = {

static const unsigned char XGI340_SR13[4][8] = {

	{0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */

	{0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */

	{0x31, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */

	{0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}  /* SR1B */

};



static unsigned char XGI340_cr41[24][8] = {

static const unsigned char XGI340_cr41[24][8] = {

	{0x20, 0x50, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 0 CR41 */

	{0xc4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 1 CR8A */

	{0xc4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 2 CR8B */
@@ -74,7 +74,7 @@ static unsigned char XGI340_cr41[24][8] = { 
	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}  /* 23 CRC5 */

};



static unsigned char XGI27_cr41[24][8] = {

static const unsigned char XGI27_cr41[24][8] = {

	{0x20, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 0 CR41 */

	{0xC4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 1 CR8A */

	{0xC4, 0x40, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 2 CR8B */
@@ -2335,7 +2335,7 @@ static const struct SiS_VBVCLKData XGI_VBVCLKData[] = { 
#define XGI301TVDelay 0x22

#define XGI301LCDDelay 0x12



static unsigned char TVAntiFlickList[] = {/* NTSCAntiFlicker */

static const unsigned char TVAntiFlickList[] = {/* NTSCAntiFlicker */

	0x04, /* ; 0 Adaptive */

	0x00, /* ; 1 new anti-flicker ? */
@@ -2347,7 +2347,7 @@ static unsigned char TVAntiFlickList[] = {/* NTSCAntiFlicker */ 
};





static unsigned char TVEdgeList[] = {

static const unsigned char TVEdgeList[] = {

	0x00, /* ; 0 NTSC No Edge enhance */

	0x04, /* ; 1 NTSC Adaptive Edge enhance */

	0x00, /* ; 0 PAL No Edge enhance */
@@ -2356,7 +2356,7 @@ static unsigned char TVEdgeList[] = { 
	0x00  /* ; 1 HiTV */

};



static unsigned long TVPhaseList[] = {

static const unsigned long TVPhaseList[] = {

	0x08BAED21, /* ; 0 NTSC phase */

	0x00E3052A, /* ; 1 PAL phase */

	0x9B2EE421, /* ; 2 PAL-M phase */
@@ -2373,7 +2373,7 @@ static unsigned long TVPhaseList[] = { 
	0xE00A831E  /* ; D PAL-M 1024x768 */

};



static unsigned char NTSCYFilter1[] = {

static const unsigned char NTSCYFilter1[] = {

	0x00, 0xF4, 0x10, 0x38, /* 0 : 320x text mode */

	0x00, 0xF4, 0x10, 0x38, /* 1 : 360x text mode */

	0xEB, 0x04, 0x25, 0x18, /* 2 : 640x text mode */
@@ -2383,7 +2383,7 @@ static unsigned char NTSCYFilter1[] = { 
	0xEB, 0x15, 0x25, 0xF6  /* 6 : 800x gra. mode */

};



static unsigned char PALYFilter1[] = {

static const unsigned char PALYFilter1[] = {

	0x00, 0xF4, 0x10, 0x38, /* 0 : 320x text mode */

	0x00, 0xF4, 0x10, 0x38, /* 1 : 360x text mode */

	0xF1, 0xF7, 0x1F, 0x32, /* 2 : 640x text mode */
@@ -2393,7 +2393,7 @@ static unsigned char PALYFilter1[] = { 
	0xFC, 0xFB, 0x14, 0x2A  /* 6 : 800x gra. mode */

};



static unsigned char xgifb_palmn_yfilter1[] = {

static const unsigned char xgifb_palmn_yfilter1[] = {

	0x00, 0xF4, 0x10, 0x38, /* 0 : 320x text mode */

	0x00, 0xF4, 0x10, 0x38, /* 1 : 360x text mode */

	0xEB, 0x04, 0x10, 0x18, /* 2 : 640x text mode */
@@ -2404,7 +2404,7 @@ static unsigned char xgifb_palmn_yfilter1[] = { 
	0xFF, 0xFF, 0xFF, 0xFF  /* End of Table */

};



static unsigned char xgifb_yfilter2[] = {

static const unsigned char xgifb_yfilter2[] = {

	0xFF, 0x03, 0x02, 0xF6, 0xFC, 0x27, 0x46, /* 0 : 320x text mode */

	0x01, 0x02, 0xFE, 0xF7, 0x03, 0x27, 0x3C, /* 1 : 360x text mode */

	0xFF, 0x03, 0x02, 0xF6, 0xFC, 0x27, 0x46, /* 2 : 640x text mode */
@@ -2415,7 +2415,7 @@ static unsigned char xgifb_yfilter2[] = { 
	0xFF, 0xFF, 0xFC, 0x00, 0x0F, 0x22, 0x28  /* 7 : 1024xgra. mode */

};



static unsigned char XGI_NTSC1024AdjTime[] = {

static const unsigned char XGI_NTSC1024AdjTime[] = {

	0xa7, 0x07, 0xf2, 0x6e, 0x17, 0x8b, 0x73, 0x53,

	0x13, 0x40, 0x34, 0xF4, 0x63, 0xBB, 0xCC, 0x7A,

	0x58, 0xe4, 0x73, 0xd0, 0x13