Skip to content

L
linux
Commit e0cc8a60 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files
Options

staging: xgifb: vb_init: make internal functions static 

Make some internal functions static.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2b9edd38
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 28 deletions
drivers/staging/xgifb/vb_ext.h
View file @ e0cc8a60
...@@ -22,9 +22,6 @@ typedef union _X86_REGS { ...@@ -22,9 +22,6 @@ typedef union _X86_REGS {
} X86_REGS, *PX86_REGS; } X86_REGS, *PX86_REGS;
extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo);
extern void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
extern void ReadVBIOSTablData(unsigned char ChipType,
struct vb_device_info *pVBInfo);
extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *, extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,
struct vb_device_info *pVBInfo); struct vb_device_info *pVBInfo);
......
drivers/staging/xgifb/vb_init.c
View file @ e0cc8a60
...@@ -37,22 +37,23 @@ static unsigned short XGINew_DDRDRAM_TYPE20[12][5] = { ...@@ -37,22 +37,23 @@ static unsigned short XGINew_DDRDRAM_TYPE20[12][5] = {
{ 2, 12, 9, 8, 0x35}, { 2, 12, 9, 8, 0x35},
{ 2, 12, 8, 4, 0x31} }; { 2, 12, 8, 4, 0x31} };
void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *, struct vb_device_info *); static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *, struct vb_device_info *);
void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtension,
unsigned long, struct vb_device_info *); unsigned long, struct vb_device_info *);
unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, static unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo); struct vb_device_info *pVBInfo);
int XGINew_DDRSizing340(struct xgi_hw_device_info *, struct vb_device_info *); static int XGINew_DDRSizing340(struct xgi_hw_device_info *, struct vb_device_info *);
static int XGINew_RAMType; /*int ModeIDOffset,StandTable,CRT1Table,ScreenOffset,REFIndex;*/ static int XGINew_RAMType; /*int ModeIDOffset,StandTable,CRT1Table,ScreenOffset,REFIndex;*/
void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo); static void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo);
void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo); static void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo);
void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo); static unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo);
void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; static void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo); static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo);
static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
static void DelayUS(unsigned long MicroSeconds) static void DelayUS(unsigned long MicroSeconds)
{ {
...@@ -419,7 +420,7 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) ...@@ -419,7 +420,7 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
/* ============== alan ====================== */ /* ============== alan ====================== */
unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, static unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned char data, temp; unsigned char data, temp;
...@@ -705,7 +706,7 @@ static void XGINew_DDR2_DefaultRegister( ...@@ -705,7 +706,7 @@ static void XGINew_DDR2_DefaultRegister(
XGINew_DDR2_MRS_XG20(HwDeviceExtension, P3c4, pVBInfo); XGINew_DDR2_MRS_XG20(HwDeviceExtension, P3c4, pVBInfo);
} }
void XGINew_SetDRAMDefaultRegister340( static void XGINew_SetDRAMDefaultRegister340(
struct xgi_hw_device_info *HwDeviceExtension, struct xgi_hw_device_info *HwDeviceExtension,
unsigned long Port, struct vb_device_info *pVBInfo) unsigned long Port, struct vb_device_info *pVBInfo)
{ {
...@@ -834,7 +835,7 @@ void XGINew_SetDRAMDefaultRegister340( ...@@ -834,7 +835,7 @@ void XGINew_SetDRAMDefaultRegister340(
XGINew_SetReg1(P3c4, 0x1B, pVBInfo->SR15[3][XGINew_RAMType]); /* SR1B */ XGINew_SetReg1(P3c4, 0x1B, pVBInfo->SR15[3][XGINew_RAMType]); /* SR1B */
} }
void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned short data; unsigned short data;
...@@ -1246,7 +1247,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -1246,7 +1247,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
} }
} }
int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
int i; int i;
...@@ -1289,7 +1290,7 @@ int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -1289,7 +1290,7 @@ int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
return 0; return 0;
} }
void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
...@@ -1314,7 +1315,7 @@ void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -1314,7 +1315,7 @@ void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension,
} }
} }
void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo) static void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo)
{ {
volatile unsigned char *pVideoMemory = (unsigned char *) pVBInfo->ROMAddr; volatile unsigned char *pVideoMemory = (unsigned char *) pVBInfo->ROMAddr;
unsigned long i; unsigned long i;
...@@ -1404,7 +1405,7 @@ void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo) ...@@ -1404,7 +1405,7 @@ void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo)
} }
} }
void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo) static void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo)
{ {
XGINew_SetReg1(P3c4, 0x18, 0x01); XGINew_SetReg1(P3c4, 0x18, 0x01);
...@@ -1434,7 +1435,7 @@ void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo) ...@@ -1434,7 +1435,7 @@ void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo)
XGINew_SetReg1(P3c4, 0x1B, 0x00); XGINew_SetReg1(P3c4, 0x1B, 0x00);
} }
void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned short tempbx = 0, temp, tempcx, CR3CData; unsigned short tempbx = 0, temp, tempcx, CR3CData;
...@@ -1482,7 +1483,7 @@ void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -1482,7 +1483,7 @@ void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
XGINew_SetReg1(pVBInfo->P3d4, 0x3e, ((tempbx & 0xFF00) >> 8)); XGINew_SetReg1(pVBInfo->P3d4, 0x3e, ((tempbx & 0xFF00) >> 8));
} }
void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned short temp, tempcl = 0, tempch = 0, CR31Data, CR38Data; unsigned short temp, tempcl = 0, tempch = 0, CR31Data, CR38Data;
...@@ -1564,7 +1565,7 @@ void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -1564,7 +1565,7 @@ void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension,
} }
void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned char Temp; unsigned char Temp;
...@@ -1598,7 +1599,7 @@ void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -1598,7 +1599,7 @@ void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,
#endif #endif
} }
void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
{ {
unsigned char Temp, bCR4A; unsigned char Temp, bCR4A;
...@@ -1620,7 +1621,7 @@ void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -1620,7 +1621,7 @@ void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension,
} }
unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo) static unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo)
{ {
unsigned char CR38, CR4A, temp; unsigned char CR38, CR4A, temp;
...@@ -1639,7 +1640,7 @@ unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo) ...@@ -1639,7 +1640,7 @@ unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo)
return temp; return temp;
} }
unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo) static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo)
{ {
unsigned char CR4A, temp; unsigned char CR4A, temp;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7