aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-03-08 15:16:20 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 19:02:55 -0500
commite0cc8a60c4f9352c8281af6eb49f13cf5a7bb476 (patch)
treeda61ea8d3c9487cca3fd22e9cfe3aeb56c87bcbe /drivers/staging
parent2b9edd38230ba99f7faeebf69400cfa612642695 (diff)
staging: xgifb: vb_init: make internal functions static
Make some internal functions static. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/xgifb/vb_ext.h3
-rw-r--r--drivers/staging/xgifb/vb_init.c51
2 files changed, 26 insertions, 28 deletions
diff --git a/drivers/staging/xgifb/vb_ext.h b/drivers/staging/xgifb/vb_ext.h
index 68245254974..cabe365579c 100644
--- a/drivers/staging/xgifb/vb_ext.h
+++ b/drivers/staging/xgifb/vb_ext.h
@@ -22,9 +22,6 @@ typedef union _X86_REGS {
22} X86_REGS, *PX86_REGS; 22} X86_REGS, *PX86_REGS;
23 23
24extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); 24extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo);
25extern void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
26extern void ReadVBIOSTablData(unsigned char ChipType,
27 struct vb_device_info *pVBInfo);
28extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *, 25extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,
29 struct vb_device_info *pVBInfo); 26 struct vb_device_info *pVBInfo);
30 27
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 2cf50ddc5b5..4bbcff6aedf 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -37,22 +37,23 @@ static unsigned short XGINew_DDRDRAM_TYPE20[12][5] = {
37 { 2, 12, 9, 8, 0x35}, 37 { 2, 12, 9, 8, 0x35},
38 { 2, 12, 8, 4, 0x31} }; 38 { 2, 12, 8, 4, 0x31} };
39 39
40void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *, struct vb_device_info *); 40static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *, struct vb_device_info *);
41void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); 41static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *);
42void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtension, 42static void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtension,
43 unsigned long, struct vb_device_info *); 43 unsigned long, struct vb_device_info *);
44unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, 44static unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
45 struct vb_device_info *pVBInfo); 45 struct vb_device_info *pVBInfo);
46 46
47int XGINew_DDRSizing340(struct xgi_hw_device_info *, struct vb_device_info *); 47static int XGINew_DDRSizing340(struct xgi_hw_device_info *, struct vb_device_info *);
48static int XGINew_RAMType; /*int ModeIDOffset,StandTable,CRT1Table,ScreenOffset,REFIndex;*/ 48static int XGINew_RAMType; /*int ModeIDOffset,StandTable,CRT1Table,ScreenOffset,REFIndex;*/
49void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo); 49static void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo);
50void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo); 50static void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo);
51void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; 51static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
52void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; 52static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
53unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo); 53static unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo);
54void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; 54static void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
55unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo); 55static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo);
56static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ;
56 57
57static void DelayUS(unsigned long MicroSeconds) 58static void DelayUS(unsigned long MicroSeconds)
58{ 59{
@@ -419,7 +420,7 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
419 420
420/* ============== alan ====================== */ 421/* ============== alan ====================== */
421 422
422unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, 423static unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
423 struct vb_device_info *pVBInfo) 424 struct vb_device_info *pVBInfo)
424{ 425{
425 unsigned char data, temp; 426 unsigned char data, temp;
@@ -705,7 +706,7 @@ static void XGINew_DDR2_DefaultRegister(
705 XGINew_DDR2_MRS_XG20(HwDeviceExtension, P3c4, pVBInfo); 706 XGINew_DDR2_MRS_XG20(HwDeviceExtension, P3c4, pVBInfo);
706} 707}
707 708
708void XGINew_SetDRAMDefaultRegister340( 709static void XGINew_SetDRAMDefaultRegister340(
709 struct xgi_hw_device_info *HwDeviceExtension, 710 struct xgi_hw_device_info *HwDeviceExtension,
710 unsigned long Port, struct vb_device_info *pVBInfo) 711 unsigned long Port, struct vb_device_info *pVBInfo)
711{ 712{
@@ -834,7 +835,7 @@ void XGINew_SetDRAMDefaultRegister340(
834 XGINew_SetReg1(P3c4, 0x1B, pVBInfo->SR15[3][XGINew_RAMType]); /* SR1B */ 835 XGINew_SetReg1(P3c4, 0x1B, pVBInfo->SR15[3][XGINew_RAMType]); /* SR1B */
835} 836}
836 837
837void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension, 838static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension,
838 struct vb_device_info *pVBInfo) 839 struct vb_device_info *pVBInfo)
839{ 840{
840 unsigned short data; 841 unsigned short data;
@@ -1246,7 +1247,7 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
1246 } 1247 }
1247} 1248}
1248 1249
1249int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, 1250static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
1250 struct vb_device_info *pVBInfo) 1251 struct vb_device_info *pVBInfo)
1251{ 1252{
1252 int i; 1253 int i;
@@ -1289,7 +1290,7 @@ int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
1289 return 0; 1290 return 0;
1290} 1291}
1291 1292
1292void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, 1293static void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension,
1293 struct vb_device_info *pVBInfo) 1294 struct vb_device_info *pVBInfo)
1294{ 1295{
1295 1296
@@ -1314,7 +1315,7 @@ void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension,
1314 } 1315 }
1315} 1316}
1316 1317
1317void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo) 1318static void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo)
1318{ 1319{
1319 volatile unsigned char *pVideoMemory = (unsigned char *) pVBInfo->ROMAddr; 1320 volatile unsigned char *pVideoMemory = (unsigned char *) pVBInfo->ROMAddr;
1320 unsigned long i; 1321 unsigned long i;
@@ -1404,7 +1405,7 @@ void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo)
1404 } 1405 }
1405} 1406}
1406 1407
1407void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo) 1408static void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo)
1408{ 1409{
1409 1410
1410 XGINew_SetReg1(P3c4, 0x18, 0x01); 1411 XGINew_SetReg1(P3c4, 0x18, 0x01);
@@ -1434,7 +1435,7 @@ void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo)
1434 XGINew_SetReg1(P3c4, 0x1B, 0x00); 1435 XGINew_SetReg1(P3c4, 0x1B, 0x00);
1435} 1436}
1436 1437
1437void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, 1438static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
1438 struct vb_device_info *pVBInfo) 1439 struct vb_device_info *pVBInfo)
1439{ 1440{
1440 unsigned short tempbx = 0, temp, tempcx, CR3CData; 1441 unsigned short tempbx = 0, temp, tempcx, CR3CData;
@@ -1482,7 +1483,7 @@ void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
1482 XGINew_SetReg1(pVBInfo->P3d4, 0x3e, ((tempbx & 0xFF00) >> 8)); 1483 XGINew_SetReg1(pVBInfo->P3d4, 0x3e, ((tempbx & 0xFF00) >> 8));
1483} 1484}
1484 1485
1485void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, 1486static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension,
1486 struct vb_device_info *pVBInfo) 1487 struct vb_device_info *pVBInfo)
1487{ 1488{
1488 unsigned short temp, tempcl = 0, tempch = 0, CR31Data, CR38Data; 1489 unsigned short temp, tempcl = 0, tempch = 0, CR31Data, CR38Data;
@@ -1564,7 +1565,7 @@ void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension,
1564 1565
1565} 1566}
1566 1567
1567void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, 1568static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,
1568 struct vb_device_info *pVBInfo) 1569 struct vb_device_info *pVBInfo)
1569{ 1570{
1570 unsigned char Temp; 1571 unsigned char Temp;
@@ -1598,7 +1599,7 @@ void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,
1598#endif 1599#endif
1599} 1600}
1600 1601
1601void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, 1602static void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension,
1602 struct vb_device_info *pVBInfo) 1603 struct vb_device_info *pVBInfo)
1603{ 1604{
1604 unsigned char Temp, bCR4A; 1605 unsigned char Temp, bCR4A;
@@ -1620,7 +1621,7 @@ void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension,
1620 1621
1621} 1622}
1622 1623
1623unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo) 1624static unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo)
1624{ 1625{
1625 unsigned char CR38, CR4A, temp; 1626 unsigned char CR38, CR4A, temp;
1626 1627
@@ -1639,7 +1640,7 @@ unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo)
1639 return temp; 1640 return temp;
1640} 1641}
1641 1642
1642unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo) 1643static unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo)
1643{ 1644{
1644 unsigned char CR4A, temp; 1645 unsigned char CR4A, temp;
1645 1646
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 18:24:39 -0400