Commit bdc9eb14 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: constify LCD data

Make read-only LCD data tables const.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d1c6299
...@@ -1305,7 +1305,7 @@ static void XGI_GetLVDSResInfo(unsigned short ModeNo, ...@@ -1305,7 +1305,7 @@ static void XGI_GetLVDSResInfo(unsigned short ModeNo,
pVBInfo->VDE = yres; pVBInfo->VDE = yres;
} }
static void *XGI_GetLcdPtr(struct XGI330_LCDDataTablStruct const *table, static void const *XGI_GetLcdPtr(struct XGI330_LCDDataTablStruct const *table,
unsigned short ModeNo, unsigned short ModeNo,
unsigned short ModeIdIndex, unsigned short ModeIdIndex,
unsigned short RefreshRateTableIndex, unsigned short RefreshRateTableIndex,
...@@ -1380,7 +1380,7 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -1380,7 +1380,7 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex,
unsigned short RefreshRateTableIndex, unsigned short RefreshRateTableIndex,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
struct SiS_LVDSData *LCDPtr = NULL; struct SiS_LVDSData const *LCDPtr = NULL;
if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
LCDPtr = XGI_GetLcdPtr(XGI_EPLLCDDataPtr, ModeNo, ModeIdIndex, LCDPtr = XGI_GetLcdPtr(XGI_EPLLCDDataPtr, ModeNo, ModeIdIndex,
...@@ -1421,8 +1421,8 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -1421,8 +1421,8 @@ static void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex,
{ {
unsigned char index; unsigned char index;
unsigned short i; unsigned short i;
struct XGI_LVDSCRT1HDataStruct *LCDPtr = NULL; struct XGI_LVDSCRT1HDataStruct const *LCDPtr = NULL;
struct XGI_LVDSCRT1VDataStruct *LCDPtr1 = NULL; struct XGI_LVDSCRT1VDataStruct const *LCDPtr1 = NULL;
index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC; index = pVBInfo->RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
index = index & IndexMask; index = index & IndexMask;
...@@ -1526,8 +1526,8 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -1526,8 +1526,8 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
{ {
unsigned short tempbx, tempax, tempcx, tempdx, push1, push2, modeflag; unsigned short tempbx, tempax, tempcx, tempdx, push1, push2, modeflag;
unsigned long temp, temp1, temp2, temp3, push3; unsigned long temp, temp1, temp2, temp3, push3;
struct XGI_LCDDesStruct *LCDPtr = NULL; struct XGI_LCDDesStruct const *LCDPtr = NULL;
struct XGI330_LCDDataDesStruct2 *LCDPtr1 = NULL; struct XGI330_LCDDataDesStruct2 const *LCDPtr1 = NULL;
modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag; modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
if (pVBInfo->LCDInfo & EnableScalingLCD) if (pVBInfo->LCDInfo & EnableScalingLCD)
...@@ -2770,7 +2770,7 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -2770,7 +2770,7 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
{ {
unsigned short tempax = 0, tempbx = 0, modeflag, resinfo; unsigned short tempax = 0, tempbx = 0, modeflag, resinfo;
struct SiS_LCDData *LCDPtr = NULL; struct SiS_LCDData const *LCDPtr = NULL;
/* si+Ext_ResInfo */ /* si+Ext_ResInfo */
modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag; modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
...@@ -3975,7 +3975,7 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -3975,7 +3975,7 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
unsigned short push1, push2, pushbx, tempax, tempbx, tempcx, temp, unsigned short push1, push2, pushbx, tempax, tempbx, tempcx, temp,
tempah, tempbh, tempch, resinfo, modeflag, CRT1Index; tempah, tempbh, tempch, resinfo, modeflag, CRT1Index;
struct XGI_LCDDesStruct *LCDBDesPtr = NULL; struct XGI_LCDDesStruct const *LCDBDesPtr = NULL;
/* si+Ext_ResInfo */ /* si+Ext_ResInfo */
modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag; modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
......
...@@ -56,7 +56,7 @@ struct XGI330_LCDDataTablStruct { ...@@ -56,7 +56,7 @@ struct XGI330_LCDDataTablStruct {
unsigned char PANELID; unsigned char PANELID;
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
void *DATAPTR; void const *DATAPTR;
}; };
struct XGI330_TVDataTablStruct { struct XGI330_TVDataTablStruct {
...@@ -178,7 +178,7 @@ struct vb_device_info { ...@@ -178,7 +178,7 @@ struct vb_device_info {
unsigned char *pXGINew_DRAMTypeDefinition; unsigned char *pXGINew_DRAMTypeDefinition;
unsigned char XGINew_CR97; unsigned char XGINew_CR97;
struct XGI330_LCDCapStruct *LCDCapList; struct XGI330_LCDCapStruct const *LCDCapList;
struct XGI_TimingHStruct *TimingH; struct XGI_TimingHStruct *TimingH;
struct XGI_TimingVStruct *TimingV; struct XGI_TimingVStruct *TimingV;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment