From: Randy Dunlap Date: Tue, 10 Aug 2010 15:46:44 +0000 (-0700) Subject: Staging: xgifb: fix lots of sparse warnings X-Git-Tag: v2.6.37-rc1~60^2~3^2~758 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8922967ea36eac4c2f5eaa78ec43d781340ccc31;p=profile%2Fivi%2Fkernel-x86-ivi.git Staging: xgifb: fix lots of sparse warnings Fix many sparse warnings about data or functions being static. Fix many sparse warnings about data or functions not being used (put them inside #if 0/#endif blocks). Fix sparse warnings about 0 being used for NULL. Fixed a small bit of source formatting when those lines were being modified anyway, but there is still lots of this yet to be done. Signed-off-by: Randy Dunlap Cc: devel@driverdev.osuosl.org Cc: Arnaud Patard Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/XGI_accel.h b/drivers/staging/xgifb/XGI_accel.h index 28c05799..5a0395b 100644 --- a/drivers/staging/xgifb/XGI_accel.h +++ b/drivers/staging/xgifb/XGI_accel.h @@ -179,7 +179,7 @@ /* TW: BR(16)+2 = 0x8242 */ -int xgiCmdQueLen; +static int xgiCmdQueLen; #define XGI300Idle \ { \ @@ -488,6 +488,7 @@ int xgiCmdQueLen; int XGIfb_initaccel(void); void XGIfb_syncaccel(void); +int fbcon_XGI_sync(struct fb_info *info); extern struct video_info xgi_video_info; diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 06f62ee..72448e8 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -350,20 +350,17 @@ static int enable_dstn = 0; static int XGIfb_ypan = -1; -int XGIfb_accel = 0; - - static int XGIfb_hwcursor_size = 0; static int XGIfb_CRT2_write_enable = 0; -int XGIfb_crt2type = -1; /* TW: CRT2 type (for overriding autodetection) */ -int XGIfb_tvplug = -1; /* PR: Tv plug type (for overriding autodetection) */ +static int XGIfb_crt2type = -1; /* TW: CRT2 type (for overriding autodetection) */ +static int XGIfb_tvplug = -1; /* PR: Tv plug type (for overriding autodetection) */ -int XGIfb_queuemode = -1; /* TW: Use MMIO queue mode by default (310/325 series only) */ +static int XGIfb_queuemode = -1; /* TW: Use MMIO queue mode by default (310/325 series only) */ -unsigned char XGIfb_detectedpdc = 0; +static unsigned char XGIfb_detectedpdc = 0; -unsigned char XGIfb_detectedlcda = 0xff; +static unsigned char XGIfb_detectedlcda = 0xff; @@ -372,10 +369,10 @@ unsigned char XGIfb_detectedlcda = 0xff; /* XGIfb_info XGIfbinfo; */ /* TW: Hardware extension; contains data on hardware */ -struct xgi_hw_device_info XGIhw_ext; +static struct xgi_hw_device_info XGIhw_ext; /* TW: XGI private structure */ -struct vb_device_info XGI_Pr; +static struct vb_device_info XGI_Pr; /* card parameters */ static unsigned long XGIfb_mmio_size = 0; @@ -392,7 +389,7 @@ typedef enum _XGI_CMDTYPE { /* mode table */ /* NOT const - will be patched for 1280x960 mode number chaos reasons */ -struct _XGIbios_mode { +static struct _XGIbios_mode { char name[15]; u8 mode_no; u16 vesa_mode_no_1; /* "XGI defined" VESA mode number */ @@ -491,17 +488,17 @@ static int xgifb_mode_idx = 1; #else static int xgifb_mode_idx = -1; /* Use a default mode if we are inside the kernel */ #endif -u8 XGIfb_mode_no = 0; -u8 XGIfb_rate_idx = 0; +static u8 XGIfb_mode_no = 0; +static u8 XGIfb_rate_idx = 0; /* TW: CR36 evaluation */ -const unsigned short XGI300paneltype[] = +static const unsigned short XGI300paneltype[] = { LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, LCD_1280x960, LCD_640x480, LCD_1024x600, LCD_1152x768, LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768, LCD_1024x768 }; -const unsigned short XGI310paneltype[] = +static const unsigned short XGI310paneltype[] = { LCD_UNKNOWN, LCD_800x600, LCD_1024x768, LCD_1280x1024, LCD_640x480, LCD_1024x600, LCD_1152x864, LCD_1280x960, LCD_1152x768, LCD_1400x1050,LCD_1280x768, LCD_1600x1200, diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 976c39b..7cd3e95 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -44,6 +44,8 @@ #include "XGI_main.h" #include "vb_util.h" +int XGIfb_accel = 0; + #define Index_CR_GPIO_Reg1 0x48 #define Index_CR_GPIO_Reg2 0x49 @@ -161,8 +163,9 @@ struct video_info xgi_video_info; /* --------------- Hardware Access Routines -------------------------- */ -int -XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, +static int +XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, + struct xgi_hw_device_info *HwDeviceExtension, unsigned char modeno, unsigned char rateindex) { unsigned short ModeNo = modeno; @@ -196,8 +199,9 @@ XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr, struct xgi_hw_device_in return(Clock); } -int -XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, +static int +XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, + struct xgi_hw_device_info *HwDeviceExtension, unsigned char modeno, unsigned char rateindex, u32 *left_margin, u32 *right_margin, u32 *upper_margin, u32 *lower_margin, @@ -377,7 +381,7 @@ XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, struct xgi_hw_device_inf -void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr) +static void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr) { XGI_Pr->RelIO = BaseAddr; XGI_Pr->P3c4 = BaseAddr + 0x14; @@ -570,7 +574,7 @@ static void XGIfb_search_vesamode(unsigned int vesamode) if(!j) printk(KERN_INFO "XGIfb: Invalid VESA mode 0x%x'\n", vesamode); } -int XGIfb_GetXG21LVDSData(void) +static int XGIfb_GetXG21LVDSData(void) { u8 tmp; unsigned char *pData; @@ -2057,9 +2061,9 @@ static int XGIfb_heap_init(void) int agp_enabled = 1; u32 agp_size; - unsigned long *cmdq_baseport = 0; - unsigned long *read_port = 0; - unsigned long *write_port = 0; + unsigned long *cmdq_baseport = NULL; + unsigned long *read_port = NULL; + unsigned long *write_port = NULL; XGI_CMDTYPE cmd_type; #ifndef AGPOFF struct agp_kern_info *agp_info; @@ -2827,7 +2831,7 @@ XGIINITSTATIC int __init XGIfb_setup(char *options) static unsigned char VBIOS_BUF[65535]; -unsigned char *attempt_map_rom(struct pci_dev *dev, void *copy_address) +static unsigned char *attempt_map_rom(struct pci_dev *dev, void *copy_address) { u32 rom_size = 0; u32 rom_address = 0; @@ -2872,7 +2876,8 @@ unsigned char *attempt_map_rom(struct pci_dev *dev, void *copy_address) return copy_address; } -int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +static int __devinit xgifb_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) { u16 reg16; u8 reg, reg1; @@ -3641,7 +3646,7 @@ MODULE_PARM_DESC(nocrt2rate, -int __init xgifb_init_module(void) +static int __init xgifb_init_module(void) { printk("\nXGIfb_init_module"); if(mode) diff --git a/drivers/staging/xgifb/vb_ext.c b/drivers/staging/xgifb/vb_ext.c index 1ecf9e3..9774c41 100644 --- a/drivers/staging/xgifb/vb_ext.c +++ b/drivers/staging/xgifb/vb_ext.c @@ -44,7 +44,7 @@ unsigned char XGI_Is301LV(struct vb_device_info *); /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_Is301B(struct vb_device_info *pVBInfo) +static unsigned char XGINew_Is301B(struct vb_device_info *pVBInfo) { unsigned short flag ; @@ -816,7 +816,8 @@ unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, str ; DX: PAnel V. resolution ;----------------------------------------------------------------------------- */ -void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments) +static void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo, + PX86_REGS pBiosArguments) { unsigned short ModeIdIndex; @@ -859,7 +860,8 @@ void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments ; ;----------------------------------------------------------------------------- */ -void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments) +static void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo, + PX86_REGS pBiosArguments) { unsigned short EModeCount; @@ -905,7 +907,8 @@ void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments ; ;----------------------------------------------------------------------------- */ -void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments) +static void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo, + PX86_REGS pBiosArguments) { unsigned short ModeIdIndex, resindex; unsigned short ModeNo; @@ -964,7 +967,8 @@ void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments ; BX[6]: *Value1 D[6] Panel H. Polarity ;----------------------------------------------------------------------------- */ -void XGI_XG21Fun14Sub73(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments) +static void XGI_XG21Fun14Sub73(struct vb_device_info *pVBInfo, + PX86_REGS pBiosArguments) { unsigned char Select; diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index e02722d..e0153d3 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -18,7 +18,7 @@ -unsigned char XGINew_ChannelAB, XGINew_DataBusWidth; +static unsigned char XGINew_ChannelAB, XGINew_DataBusWidth; unsigned short XGINew_DRAMType[17][5] = { {0x0C, 0x0A, 0x02, 0x40, 0x39}, {0x0D, 0x0A, 0x01, 0x40, 0x48}, @@ -31,7 +31,7 @@ unsigned short XGINew_DRAMType[17][5] = { {0x0B, 0x08, 0x01, 0x04, 0x20}, {0x0A, 0x08, 0x01, 0x02, 0x10}, {0x09, 0x08, 0x01, 0x01, 0x00} }; -unsigned short XGINew_SDRDRAM_TYPE[13][5] = { +static unsigned short XGINew_SDRDRAM_TYPE[13][5] = { { 2, 12, 9, 64, 0x35}, { 1, 13, 9, 64, 0x44}, { 2, 12, 8, 32, 0x31}, @@ -46,19 +46,19 @@ unsigned short XGINew_SDRDRAM_TYPE[13][5] = { { 1, 10, 8, 4, 0x10}, { 1, 9, 8, 2, 0x00} }; -unsigned short XGINew_DDRDRAM_TYPE[4][5] = { +static unsigned short XGINew_DDRDRAM_TYPE[4][5] = { { 2, 12, 9, 64, 0x35}, { 2, 12, 8, 32, 0x31}, { 2, 11, 8, 16, 0x21}, { 2, 9, 8, 4, 0x01} }; -unsigned short XGINew_DDRDRAM_TYPE340[4][5] = { +static unsigned short XGINew_DDRDRAM_TYPE340[4][5] = { { 2, 13, 9, 64, 0x45}, { 2, 12, 9, 32, 0x35}, { 2, 12, 8, 16, 0x31}, { 2, 11, 8, 8, 0x21} }; -unsigned short XGINew_DDRDRAM_TYPE20[12][5] = { +static unsigned short XGINew_DDRDRAM_TYPE20[12][5] = { { 2, 14, 11, 128, 0x5D}, { 2, 14, 10, 64, 0x59}, { 2, 13, 11, 64, 0x4D}, @@ -89,8 +89,10 @@ void XGINew_CheckBusWidth_310(struct vb_device_info *) ; int XGINew_SDRSizing(struct vb_device_info *); int XGINew_DDRSizing(struct vb_device_info *); void XGINew_EnableRefresh(struct xgi_hw_device_info *, struct vb_device_info *); -int XGINew_RAMType; /*int ModeIDOffset,StandTable,CRT1Table,ScreenOffset,REFIndex;*/ -unsigned long UNIROM; /* UNIROM */ +static int XGINew_RAMType; /*int ModeIDOffset,StandTable,CRT1Table,ScreenOffset,REFIndex;*/ +#if 0 +static unsigned long UNIROM; +#endif unsigned char ChkLFB(struct vb_device_info *); void XGINew_Delay15us(unsigned long); void SetPowerConsume(struct xgi_hw_device_info *HwDeviceExtension, @@ -106,7 +108,7 @@ unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo); void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo); -void DelayUS(unsigned long MicroSeconds) +static void DelayUS(unsigned long MicroSeconds) { udelay(MicroSeconds); } @@ -148,7 +150,7 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) /* if ( pVBInfo->ROMAddr == 0 ) */ /* return( 0 ) ; */ - if (pVBInfo->FBAddr == 0) { + if (pVBInfo->FBAddr == NULL) { printk("\n pVBInfo->FBAddr == 0 "); return 0; } @@ -617,7 +619,7 @@ unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtensio /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_Get310DRAMType(struct vb_device_info *pVBInfo) +static unsigned char XGINew_Get310DRAMType(struct vb_device_info *pVBInfo) { unsigned char data ; @@ -653,7 +655,7 @@ void XGINew_Delay15us(unsigned long ulMicrsoSec) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SDR_MRS(struct vb_device_info *pVBInfo) +static void XGINew_SDR_MRS(struct vb_device_info *pVBInfo) { unsigned short data ; @@ -673,7 +675,7 @@ void XGINew_SDR_MRS(struct vb_device_info *pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR1x_MRS_340(unsigned long P3c4, struct vb_device_info *pVBInfo) +static void XGINew_DDR1x_MRS_340(unsigned long P3c4, struct vb_device_info *pVBInfo) { XGINew_SetReg1( P3c4 , 0x18 , 0x01 ) ; XGINew_SetReg1( P3c4 , 0x19 , 0x20 ) ; @@ -711,7 +713,8 @@ void XGINew_DDR1x_MRS_340(unsigned long P3c4, struct vb_device_info *pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2x_MRS_340(unsigned long P3c4, struct vb_device_info *pVBInfo) +static void XGINew_DDR2x_MRS_340(unsigned long P3c4, + struct vb_device_info *pVBInfo) { XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ; XGINew_SetReg1( P3c4 , 0x19 , 0x20 ) ; @@ -740,8 +743,10 @@ void XGINew_DDR2x_MRS_340(unsigned long P3c4, struct vb_device_info *pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDRII_Bootup_XG27(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long P3c4, struct vb_device_info *pVBInfo) +static void XGINew_DDRII_Bootup_XG27( + struct xgi_hw_device_info *HwDeviceExtension, + unsigned long P3c4, + struct vb_device_info *pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; XGINew_RAMType = ( int )XGINew_GetXG20DRAMType( HwDeviceExtension , pVBInfo ) ; @@ -819,7 +824,7 @@ void XGINew_DDRII_Bootup_XG27(struct xgi_hw_device_info *HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension, +static void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension, unsigned long P3c4, struct vb_device_info *pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; @@ -866,13 +871,14 @@ void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension, DelayUS( 200 ) ; } +#if 0 /* --------------------------------------------------------------------- */ /* Function : XGINew_DDR2_MRS_XG20 */ /* Input : */ /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2_MRS_XG27(struct xgi_hw_device_info *HwDeviceExtension, +static void XGINew_DDR2_MRS_XG27(struct xgi_hw_device_info *HwDeviceExtension, unsigned long P3c4, struct vb_device_info *pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; @@ -944,6 +950,7 @@ void XGINew_DDR2_MRS_XG27(struct xgi_hw_device_info *HwDeviceExtension, XGINew_SetReg1( P3c4 , 0x1B , 0x03 ) ; /* SR1B */ } +#endif /* --------------------------------------------------------------------- */ /* Function : XGINew_DDR1x_DefaultRegister */ @@ -951,8 +958,10 @@ void XGINew_DDR2_MRS_XG27(struct xgi_hw_device_info *HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR1x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long Port, struct vb_device_info *pVBInfo) +static void XGINew_DDR1x_DefaultRegister( + struct xgi_hw_device_info *HwDeviceExtension, + unsigned long Port, + struct vb_device_info *pVBInfo) { unsigned long P3d4 = Port , P3c4 = Port - 0x10 ; @@ -1005,15 +1014,17 @@ void XGINew_DDR1x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, } } - +#if 0 /* --------------------------------------------------------------------- */ /* Function : XGINew_DDR2x_DefaultRegister */ /* Input : */ /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long Port, struct vb_device_info *pVBInfo) +static void XGINew_DDR2x_DefaultRegister( + struct xgi_hw_device_info *HwDeviceExtension, + unsigned long Port, + struct vb_device_info *pVBInfo) { unsigned long P3d4 = Port , P3c4 = Port - 0x10 ; @@ -1056,7 +1067,7 @@ void XGINew_DDR2x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, XGINew_DDR2x_MRS_340( P3c4 , pVBInfo ) ; } - +#endif /* --------------------------------------------------------------------- */ /* Function : XGINew_DDR2_DefaultRegister */ @@ -1064,8 +1075,10 @@ void XGINew_DDR2x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long Port, struct vb_device_info *pVBInfo) +static void XGINew_DDR2_DefaultRegister( + struct xgi_hw_device_info *HwDeviceExtension, + unsigned long Port, + struct vb_device_info *pVBInfo) { unsigned long P3d4 = Port , P3c4 = Port - 0x10 ; @@ -1247,7 +1260,7 @@ void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtensi /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR_MRS(struct vb_device_info *pVBInfo) +static void XGINew_DDR_MRS(struct vb_device_info *pVBInfo) { unsigned short data ; @@ -1315,7 +1328,8 @@ void XGINew_DDR_MRS(struct vb_device_info *pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_VerifyMclk(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) +static void XGINew_VerifyMclk(struct xgi_hw_device_info *HwDeviceExtension, + struct vb_device_info *pVBInfo) { unsigned char *pVideoMemory = pVBInfo->FBAddr ; unsigned char i, j ; @@ -1561,7 +1575,7 @@ void XGINew_EnableRefresh(struct xgi_hw_device_info *HwDeviceExtension, struct v /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DisableChannelInterleaving(int index, +static void XGINew_DisableChannelInterleaving(int index, unsigned short XGINew_DDRDRAM_TYPE[][5], struct vb_device_info *pVBInfo) { @@ -1597,7 +1611,7 @@ void XGINew_DisableChannelInterleaving(int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMSizingType(int index, +static void XGINew_SetDRAMSizingType(int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -1750,7 +1764,7 @@ void XGINew_CheckBusWidth_310(struct vb_device_info *pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_SetRank(int index, +static int XGINew_SetRank(int index, unsigned char RankNo, unsigned char XGINew_ChannelAB, unsigned short DRAMTYPE_TABLE[][5], @@ -1791,7 +1805,7 @@ int XGINew_SetRank(int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_SetDDRChannel(int index, +static int XGINew_SetDDRChannel(int index, unsigned char ChannelNo, unsigned char XGINew_ChannelAB, unsigned short DRAMTYPE_TABLE[][5], @@ -1831,7 +1845,7 @@ int XGINew_SetDDRChannel(int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_CheckColumn(int index, +static int XGINew_CheckColumn(int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -1865,7 +1879,7 @@ int XGINew_CheckColumn(int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_CheckBanks(int index, +static int XGINew_CheckBanks(int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -1898,7 +1912,7 @@ int XGINew_CheckBanks(int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_CheckRank(int RankNo, int index, +static int XGINew_CheckRank(int RankNo, int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -1934,7 +1948,7 @@ int XGINew_CheckRank(int RankNo, int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_CheckDDRRank(int RankNo, int index, +static int XGINew_CheckDDRRank(int RankNo, int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -1978,7 +1992,7 @@ int XGINew_CheckDDRRank(int RankNo, int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_CheckRanks(int RankNo, int index, +static int XGINew_CheckRanks(int RankNo, int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -2006,7 +2020,7 @@ int XGINew_CheckRanks(int RankNo, int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_CheckDDRRanks(int RankNo, int index, +static int XGINew_CheckDDRRanks(int RankNo, int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -2065,7 +2079,7 @@ int XGINew_SDRSizing(struct vb_device_info *pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGINew_SetDRAMSizeReg(int index, +static unsigned short XGINew_SetDRAMSizeReg(int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -2116,7 +2130,7 @@ unsigned short XGINew_SetDRAMSizeReg(int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGINew_SetDRAMSize20Reg(int index, +static unsigned short XGINew_SetDRAMSize20Reg(int index, unsigned short DRAMTYPE_TABLE[][5], struct vb_device_info *pVBInfo) { @@ -2168,8 +2182,9 @@ unsigned short XGINew_SetDRAMSize20Reg(int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_ReadWriteRest(unsigned short StopAddr, unsigned short StartAddr, - struct vb_device_info *pVBInfo) +static int XGINew_ReadWriteRest(unsigned short StopAddr, + unsigned short StartAddr, + struct vb_device_info *pVBInfo) { int i ; unsigned long Position = 0 ; @@ -2205,7 +2220,7 @@ int XGINew_ReadWriteRest(unsigned short StopAddr, unsigned short StartAddr, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_CheckFrequence(struct vb_device_info *pVBInfo) +static unsigned char XGINew_CheckFrequence(struct vb_device_info *pVBInfo) { unsigned char data ; @@ -2228,7 +2243,8 @@ unsigned char XGINew_CheckFrequence(struct vb_device_info *pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) +static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, + struct vb_device_info *pVBInfo) { unsigned char data; @@ -2672,8 +2688,9 @@ void SetPowerConsume(struct xgi_hw_device_info *HwDeviceExtension, } } - -void XGINew_InitVBIOSData(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) +#if 0 +static void XGINew_InitVBIOSData(struct xgi_hw_device_info *HwDeviceExtension, + struct vb_device_info *pVBInfo) { /* unsigned long ROMAddr = (unsigned long)HwDeviceExtension->pjVirtualRomBase; */ @@ -2715,6 +2732,7 @@ void XGINew_InitVBIOSData(struct xgi_hw_device_info *HwDeviceExtension, struct v } } +#endif /* --------------------------------------------------------------------- */ /* Function : ReadVBIOSTablData */ diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index d90bf06..cf6874b 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -124,6 +124,7 @@ void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, str void XGI_GetLVDSResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo); void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, @@ -191,7 +192,7 @@ extern void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVB /* unsigned short XGINew_flag_clearbuffer; 0: no clear frame buffer 1:clear frame buffer */ -unsigned short XGINew_MDA_DAC[] = { +static unsigned short XGINew_MDA_DAC[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, @@ -201,7 +202,7 @@ unsigned short XGINew_MDA_DAC[] = { 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F}; -unsigned short XGINew_CGA_DAC[] = { +static unsigned short XGINew_CGA_DAC[] = { 0x00, 0x10, 0x04, 0x14, 0x01, 0x11, 0x09, 0x15, 0x00, 0x10, 0x04, 0x14, 0x01, 0x11, 0x09, 0x15, 0x2A, 0x3A, 0x2E, 0x3E, 0x2B, 0x3B, 0x2F, 0x3F, @@ -211,7 +212,7 @@ unsigned short XGINew_CGA_DAC[] = { 0x2A, 0x3A, 0x2E, 0x3E, 0x2B, 0x3B, 0x2F, 0x3F, 0x2A, 0x3A, 0x2E, 0x3E, 0x2B, 0x3B, 0x2F, 0x3F}; -unsigned short XGINew_EGA_DAC[] = { +static unsigned short XGINew_EGA_DAC[] = { 0x00, 0x10, 0x04, 0x14, 0x01, 0x11, 0x05, 0x15, 0x20, 0x30, 0x24, 0x34, 0x21, 0x31, 0x25, 0x35, 0x08, 0x18, 0x0C, 0x1C, 0x09, 0x19, 0x0D, 0x1D, @@ -221,7 +222,7 @@ unsigned short XGINew_EGA_DAC[] = { 0x0A, 0x1A, 0x0E, 0x1E, 0x0B, 0x1B, 0x0F, 0x1F, 0x2A, 0x3A, 0x2E, 0x3E, 0x2B, 0x3B, 0x2F, 0x3F}; -unsigned short XGINew_VGA_DAC[] = { +static unsigned short XGINew_VGA_DAC[] = { 0x00, 0x10, 0x04, 0x14, 0x01, 0x11, 0x09, 0x15, 0x2A, 0x3A, 0x2E, 0x3E, 0x2B, 0x3B, 0x2F, 0x3F, 0x00, 0x05, 0x08, 0x0B, 0x0E, 0x11, 0x14, 0x18, @@ -2947,7 +2948,7 @@ void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, LCDPtr = (struct XGI330_LCDDataDesStruct *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); } - if ( ( pVBInfo->IF_DEF_OEMUtil == 0 ) || ( LCDPtr == 0 ) ) + if ( ( pVBInfo->IF_DEF_OEMUtil == 0 ) || ( LCDPtr == NULL ) ) { tempbx = 3 ; if ( pVBInfo->LCDInfo & EnableScalingLCD ) @@ -4058,13 +4059,15 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo, /* win2000 MM adapter not support standard mode! */ +#if 0 /* --------------------------------------------------------------------- */ /* Function : */ /* Input : */ /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtension, +static unsigned char XGINew_CheckMemorySize( + struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) @@ -4141,7 +4144,7 @@ unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtensio else return 1; } - +#endif /* --------------------------------------------------------------------- */ /* Function : XGINew_IsLowResolution */ @@ -4415,28 +4418,20 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo) } - - - - - - - - +#if 0 /* --------------------------------------------------------------------- */ /* Function : XGI_WaitDisplay */ /* Input : */ /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_WaitDisplay(struct vb_device_info *pVBInfo) +static void XGI_WaitDisplay(struct vb_device_info *pVBInfo) { while( !( XGINew_GetReg2( pVBInfo->P3da ) & 0x01 ) ) ; while( XGINew_GetReg2( pVBInfo->P3da ) & 0x01 ) ; } - - +#endif /* --------------------------------------------------------------------- */ @@ -5139,7 +5134,7 @@ void XGI_GetVCLKLen(unsigned char tempal, unsigned char *di_0, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT2Offset(unsigned short ModeNo, +static void XGI_SetCRT2Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, @@ -5218,7 +5213,7 @@ unsigned short XGI_GetOffset(unsigned short ModeNo, unsigned short ModeIdIndex, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT2FIFO(struct vb_device_info *pVBInfo) +static void XGI_SetCRT2FIFO(struct vb_device_info *pVBInfo) { XGINew_SetReg1( pVBInfo->Part1Port , 0x01 , 0x3B ) ; /* threshold high ,disable auto threshold */ XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x02 , ~( 0x3F ) , 0x04 ) ; /* threshold low default 04h */ @@ -7143,7 +7138,7 @@ void *XGI_GetLcdPtr(unsigned short BX, modeflag , table ; - struct XGI330_LCDDataTablStruct *tempdi = 0 ; + struct XGI330_LCDDataTablStruct *tempdi = NULL; tempbx = BX; @@ -7224,14 +7219,14 @@ void *XGI_GetLcdPtr(unsigned short BX, case 7: case 8: case 9: - tempdi = 0 ; + tempdi = NULL; break ; default: break ; } - if ( tempdi == 0x00 ) /* OEMUtil */ - return 0 ; + if ( tempdi == NULL ) /* OEMUtil */ + return NULL; table = tempbx ; i = 0 ; @@ -7625,7 +7620,7 @@ void *XGI_GetLcdPtr(unsigned short BX, break ; } } - return 0 ; + return NULL; } @@ -7641,7 +7636,7 @@ void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, struct vb_device_info *pVBInfo) { unsigned short i , tempdx , tempbx , tempal , modeflag , table ; - struct XGI330_TVDataTablStruct *tempdi = 0 ; + struct XGI330_TVDataTablStruct *tempdi = NULL; tempbx = BX ; @@ -7662,14 +7657,14 @@ void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, switch( tempbx ) { case 0: - tempdi = 0 ; /*EPLCHTVCRT1Ptr_H;*/ + tempdi = NULL; /*EPLCHTVCRT1Ptr_H;*/ if ( pVBInfo->IF_DEF_CH7007 == 1 ) { tempdi = XGI_EPLCHTVCRT1Ptr; } break ; case 1: - tempdi = 0 ; /*EPLCHTVCRT1Ptr_V;*/ + tempdi = NULL; /*EPLCHTVCRT1Ptr_V;*/ if ( pVBInfo->IF_DEF_CH7007 == 1 ) { tempdi = XGI_EPLCHTVCRT1Ptr; @@ -7679,13 +7674,13 @@ void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, tempdi = XGI_EPLCHTVDataPtr ; break ; case 3: - tempdi = 0 ; + tempdi = NULL; break ; case 4: tempdi = XGI_TVDataTable ; break ; case 5: - tempdi = 0 ; + tempdi = NULL; break ; case 6: tempdi = XGI_EPLCHTVRegPtr ; @@ -7694,8 +7689,8 @@ void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, break ; } - if ( tempdi == 0x00 ) /* OEMUtil */ - return( 0 ) ; + if ( tempdi == NULL ) /* OEMUtil */ + return NULL; tempdx = pVBInfo->TVInfo ; @@ -7793,7 +7788,7 @@ void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, else if( table == 0x06 ) { } - return( 0 ) ; + return NULL; } @@ -7913,7 +7908,7 @@ void XGI_SetPanelPower(unsigned short tempah, unsigned short tempbl, struct vb_d XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x11 , tempbl , tempah ) ; } -unsigned char XG21GPIODataTransfer(unsigned char ujDate) +static unsigned char XG21GPIODataTransfer(unsigned char ujDate) { unsigned char ujRet = 0; unsigned char i = 0; diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index 510ef76..78b1c79 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -1,7 +1,7 @@ #define Tap4 -struct XGI_MCLKDataStruct XGI330New_MCLKData[] = +static struct XGI_MCLKDataStruct XGI330New_MCLKData[] = { { 0x5c,0x23,0x01,166}, { 0x5c,0x23,0x01,166}, @@ -13,7 +13,7 @@ struct XGI_MCLKDataStruct XGI330New_MCLKData[] = { 0x29,0x01,0x81,300} }; //yilin modify for xgi20 -struct XGI_MCLKDataStruct XGI340New_MCLKData[] = +static struct XGI_MCLKDataStruct XGI340New_MCLKData[] = { { 0x16,0x01,0x01,166}, { 0x19,0x02,0x01,124}, @@ -25,7 +25,7 @@ struct XGI_MCLKDataStruct XGI340New_MCLKData[] = { 0x5c,0x23,0x01,166} }; -struct XGI_MCLKDataStruct XGI27New_MCLKData[] = +static struct XGI_MCLKDataStruct XGI27New_MCLKData[] = { { 0x5c,0x23,0x01,166}, { 0x19,0x02,0x01,124}, @@ -37,7 +37,7 @@ struct XGI_MCLKDataStruct XGI27New_MCLKData[] = { 0x5c,0x23,0x01,166} }; -struct XGI_ECLKDataStruct XGI330_ECLKData[] = +static struct XGI_ECLKDataStruct XGI330_ECLKData[] = { { 0x7c,0x08,0x01,200}, { 0x7c,0x08,0x01,200}, @@ -49,7 +49,7 @@ struct XGI_ECLKDataStruct XGI330_ECLKData[] = { 0x29,0x01,0x81,300} }; //yilin modify for xgi20 -struct XGI_ECLKDataStruct XGI340_ECLKData[] = +static struct XGI_ECLKDataStruct XGI340_ECLKData[] = { { 0x5c,0x23,0x01,166}, { 0x55,0x84,0x01,123}, @@ -63,14 +63,14 @@ struct XGI_ECLKDataStruct XGI340_ECLKData[] = -unsigned char XGI340_SR13[4][8] = { +static 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 */ }; -unsigned char XGI340_cr41[24][8] = +static 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 */ @@ -98,7 +98,7 @@ unsigned char XGI340_cr41[24][8] = }; -unsigned char XGI27_cr41[24][8] = +static 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 */ @@ -126,7 +126,7 @@ unsigned char XGI27_cr41[24][8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}/* 23 CRC5 */ }; -unsigned char XGI340_CR6B[8][4] = { +static unsigned char XGI340_CR6B[8][4] = { {0xaa,0xaa,0xaa,0xaa}, {0xaa,0xaa,0xaa,0xaa}, {0xaa,0xaa,0xaa,0xaa}, @@ -137,7 +137,7 @@ unsigned char XGI340_CR6B[8][4] = { {0x00,0x00,0x00,0x00} }; -unsigned char XGI340_CR6E[8][4] = { +static unsigned char XGI340_CR6E[8][4] = { {0x00,0x00,0x00,0x00}, {0x00,0x00,0x00,0x00}, {0x00,0x00,0x00,0x00}, @@ -148,7 +148,7 @@ unsigned char XGI340_CR6E[8][4] = { {0x00,0x00,0x00,0x00} }; -unsigned char XGI340_CR6F[8][32] = { +static unsigned char XGI340_CR6F[8][32] = { {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, @@ -159,7 +159,7 @@ unsigned char XGI340_CR6F[8][32] = { {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00} }; -unsigned char XGI340_CR89[8][2] = { +static unsigned char XGI340_CR89[8][2] = { {0x00,0x00}, {0x00,0x00}, {0x00,0x00}, @@ -170,12 +170,14 @@ unsigned char XGI340_CR89[8][2] = { {0x00,0x00} }; /* CR47,CR48,CR49,CR4A,CR4B,CR4C,CR70,CR71,CR74,CR75,CR76,CR77 */ -unsigned char XGI340_AGPReg[12] = {0x28, 0x23, 0x00, 0x20, 0x00, 0x20, 0x00, +static unsigned char XGI340_AGPReg[12] = { + 0x28, 0x23, 0x00, 0x20, 0x00, 0x20, 0x00, 0x05, 0xd0, 0x10, 0x10, 0x00}; -unsigned char XGI340_SR16[4] = {0x03, 0x83, 0x03, 0x83}; +static unsigned char XGI340_SR16[4] = {0x03, 0x83, 0x03, 0x83}; -unsigned char XGI330_SR15_1[8][8] = { +#if 0 +static unsigned char XGI330_SR15_1[8][8] = { {0x0,0x0,0x00,0x00,0x20,0x20,0x00,0x00}, {0x5,0x15,0x15,0x15,0x15,0x15,0x00,0x00}, {0xba,0xba,0xba,0xba,0xBA,0xBA,0x00,0x00}, @@ -186,7 +188,7 @@ unsigned char XGI330_SR15_1[8][8] = { {0x0,0xa5,0xfb,0xf6,0xF6,0xF6,0x00,0x00} }; -unsigned char XGI330_cr40_1[15][8] = { +static unsigned char XGI330_cr40_1[15][8] = { {0x66,0x40,0x40,0x28,0x24,0x24,0x00,0x00}, {0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, @@ -203,15 +205,16 @@ unsigned char XGI330_cr40_1[15][8] = { {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, {0x00,0xA2,0x00,0x00,0xA2,0xA2,0x00,0x00}, }; +#endif -unsigned char XGI330_sr25[] = {0x00, 0x0}; -unsigned char XGI330_sr31 = 0xc0; -unsigned char XGI330_sr32 = 0x11; -unsigned char XGI330_SR33 = 0x00; -unsigned char XG40_CRCF = 0x13; -unsigned char XG40_DRAMTypeDefinition = 0xFF ; +static unsigned char XGI330_sr25[] = {0x00, 0x0}; +static unsigned char XGI330_sr31 = 0xc0; +static unsigned char XGI330_sr32 = 0x11; +static unsigned char XGI330_SR33 = 0x00; +static unsigned char XG40_CRCF = 0x13; +static unsigned char XG40_DRAMTypeDefinition = 0xFF ; -struct XGI_StStruct XGI330_SModeIDTable[] = +static struct XGI_StStruct XGI330_SModeIDTable[] = { {0x01,0x9208,0x01,0x00,0x10,0x00,0x00,0x01,0x00}, {0x01,0x1210,0x14,0x01,0x00,0x01,0x00,0x01,0x00}, @@ -236,7 +239,7 @@ struct XGI_StStruct XGI330_SModeIDTable[] = }; -struct XGI_ExtStruct XGI330_EModeIDTable[] = +static struct XGI_ExtStruct XGI330_EModeIDTable[] = { {0x6a,0x2212,0x0407,0x3a81,0x0102,0x08,0x07,0x00,0x00,0x07,0x0e}, {0x2e,0x0a1b,0x0306,0x3a57,0x0101,0x08,0x06,0x00,0x00,0x05,0x06}, @@ -308,7 +311,7 @@ struct XGI_ExtStruct XGI330_EModeIDTable[] = {0xff,0x0000,0x0000,0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00} }; -struct XGI_StandTableStruct XGI330_StandTable[] = +static struct XGI_StandTableStruct XGI330_StandTable[] = { /* MD_0_200 */ { @@ -746,13 +749,13 @@ struct XGI_StandTableStruct XGI330_StandTable[] = } }; -struct XGI_TimingHStruct XGI_TimingH[] = +static struct XGI_TimingHStruct XGI_TimingH[] = {{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}}; -struct XGI_TimingVStruct XGI_TimingV[] = +static struct XGI_TimingVStruct XGI_TimingV[] = {{{0x00,0x00,0x00,0x00,0x00,0x00,0x00}}}; -struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = +static struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = { {0x01,0x27,0x91,0x8f,0xc0}, /* 00 */ {0x03,0x4f,0x83,0x8f,0xc0}, /* 01 */ @@ -773,7 +776,7 @@ struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = {0x59,0x27,0x91,0x8f,0xc0} /* 16 */ }; -struct XGI_CRT1TableStruct XGI_CRT1Table[] = +static struct XGI_CRT1TableStruct XGI_CRT1Table[] = { {{0x2d,0x28,0x90,0x2c,0x90,0x00,0x04,0x00, 0xbf,0x1f,0x9c,0x8e,0x96,0xb9,0x30}}, /* 0x0 */ @@ -921,7 +924,8 @@ struct XGI_CRT1TableStruct XGI_CRT1Table[] = 0x03,0xDE,0xC0,0x84,0xBF,0x04,0x90}} /* 0x47 */ }; -struct XGI330_CHTVRegDataStruct XGI_CHTVRegUNTSC[] = { +#if 0 +static struct XGI330_CHTVRegDataStruct XGI_CHTVRegUNTSC[] = { /* Index:000h,001h,002h,004h,003h,005h,006h,007h,008h,015h,01Fh,00Ch,00Dh,00Eh,00Fh,010h */ {{ 0x4A,0x77,0xBB,0x94,0x84,0x48,0xFE,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 00 (640x200,640x400) */ {{ 0x4A,0x77,0xBB,0x94,0x84,0x48,0xFE,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 01 (640x350) */ @@ -932,7 +936,7 @@ struct XGI330_CHTVRegDataStruct XGI_CHTVRegUNTSC[] = { {{ 0xEE,0x77,0xBB,0x66,0x87,0x32,0x01,0x5A,0x04,0x00,0x80,0x1B,0xD4,0x2F,0x6F,0x00 }}/* 06 (1024x768) ;;5/6/02 */ }; -struct XGI330_CHTVRegDataStruct XGI_CHTVRegONTSC[] = { +static struct XGI330_CHTVRegDataStruct XGI_CHTVRegONTSC[] = { /* Index:000h,001h,002h,004h,003h,005h,006h,007h,008h,015h,01Fh,00Ch,00Dh,00Eh,00Fh,010h */ {{ 0x49,0x77,0xBB,0x7B,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 00 (640x200,640x400) */ {{ 0x49,0x77,0xBB,0x7B,0x84,0x34,0x00,0x50,0x04,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 01 (640x350) */ @@ -943,7 +947,7 @@ struct XGI330_CHTVRegDataStruct XGI_CHTVRegONTSC[] = { {{ 0xED,0x77,0xBB,0x66,0x8C,0x21,0x02,0x5A,0x04,0x00,0x80,0x1F,0xA0,0x7E,0x73,0x00 }}/* 06 (1024x768) ;;5/6/02 */ }; -struct XGI330_CHTVRegDataStruct XGI_CHTVRegUPAL[] = { +static struct XGI330_CHTVRegDataStruct XGI_CHTVRegUPAL[] = { /* Index:000h,001h,002h,004h,003h,005h,006h,007h,008h,015h,01Fh,00Ch,00Dh,00Eh,00Fh,010h */ {{ 0x41,0x7F,0xB7,0x34,0xAD,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* ; 00 (640x200,640x400) */ {{ 0x41,0x7F,0xB7,0x80,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* ; 01 (640x350) */ @@ -954,7 +958,7 @@ struct XGI330_CHTVRegDataStruct XGI_CHTVRegUPAL[] = { {{ 0xE5,0x7F,0xB7,0x1D,0xA7,0x3E,0x04,0x5A,0x05,0x00,0x80,0x20,0x3E,0xE4,0x22,0x00 }}/* ; 06 (1024x768) ;;1/12/02 */ }; -struct XGI330_CHTVRegDataStruct XGI_CHTVRegOPAL[] = { +static struct XGI330_CHTVRegDataStruct XGI_CHTVRegOPAL[] = { /* Index:000,0x01,0x02,0x04,0x03,0x05,0x06,0x07,0x08,0x15,0x1F,0x0C,0x0D,0x0E,0x0F,0x10h */ {{ 0x41,0x7F,0xB7,0x36,0xAD,0x50,0x34,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 00 (640x200,640x400) */ {{ 0x41,0x7F,0xB7,0x86,0x85,0x50,0x00,0x83,0x05,0x00,0x80,0x00,0x00,0x00,0x00,0x01 }},/* 01 (640x350) */ @@ -964,15 +968,18 @@ struct XGI330_CHTVRegDataStruct XGI_CHTVRegOPAL[] = { {{ 0xC1,0x7F,0xB7,0x4D,0x8C,0x1E,0x31,0x5A,0x05,0x00,0x80,0x26,0x78,0x19,0x34,0x00 }},/* 05 (800x600) ;;1/12/02 */ {{ 0xE4,0x7F,0xB7,0x1E,0xAF,0x29,0x37,0x5A,0x05,0x00,0x80,0x25,0x8C,0xB2,0x2A,0x00 }}/* 06 (1024x768) ;;1/12/02 */ }; +#endif -unsigned char XGI_CH7017LV1024x768[] = {0x60, 0x02, 0x00, 0x07, 0x40, 0xED, 0xA3, +static unsigned char XGI_CH7017LV1024x768[] = { + 0x60, 0x02, 0x00, 0x07, 0x40, 0xED, 0xA3, 0xC8, 0xC7, 0xAC, 0xE0, 0x02}; -unsigned char XGI_CH7017LV1400x1050[] = {0x60, 0x03, 0x11, 0x00, 0x40, 0xE3, 0xAD, +static unsigned char XGI_CH7017LV1400x1050[] = { + 0x60, 0x03, 0x11, 0x00, 0x40, 0xE3, 0xAD, 0xDB, 0xF6, 0xAC, 0xE0, 0x02}; /*add for new UNIVGABIOS*/ -struct XGI330_LCDDataStruct XGI_StLCD1024x768Data[] = +static struct XGI330_LCDDataStruct XGI_StLCD1024x768Data[] = { { 62, 25, 800, 546,1344, 806}, { 32, 15, 930, 546,1344, 806}, @@ -983,7 +990,7 @@ struct XGI330_LCDDataStruct XGI_StLCD1024x768Data[] = { 1, 1,1344, 806,1344, 806} }; -struct XGI330_LCDDataStruct XGI_ExtLCD1024x768Data[] = +static struct XGI330_LCDDataStruct XGI_ExtLCD1024x768Data[] = { { 42, 25,1536, 419,1344, 806}, /* { 12, 5, 896, 512,1344, 806}, // alan 09/12/2003 */ { 48, 25,1536, 369,1344, 806}, /* { 12, 5, 896, 510,1344, 806}, // alan 09/12/2003 */ @@ -1011,7 +1018,7 @@ struct XGI330_LCDDataStruct XGI_ExtLCD1024x768Data[] = { 1, 1,1344, 806,1344, 806} };*/ -struct XGI330_LCDDataStruct XGI_CetLCD1024x768Data[] = +static struct XGI330_LCDDataStruct XGI_CetLCD1024x768Data[] = { { 1,1,1344,806,1344,806 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 1,1,1344,806,1344,806 }, /* 01 (320x350,640x350) */ @@ -1022,7 +1029,7 @@ struct XGI330_LCDDataStruct XGI_CetLCD1024x768Data[] = { 1,1,1344,806,1344,806 } /* 06 (1024x768x60Hz) */ }; -struct XGI330_LCDDataStruct XGI_StLCD1280x1024Data[] = +static struct XGI330_LCDDataStruct XGI_StLCD1280x1024Data[] = { { 22, 5, 800, 510,1650,1088}, { 22, 5, 800, 510,1650,1088}, @@ -1034,7 +1041,7 @@ struct XGI330_LCDDataStruct XGI_StLCD1280x1024Data[] = { 1, 1,1688,1066,1688,1066} }; -struct XGI330_LCDDataStruct XGI_ExtLCD1280x1024Data[] = +static struct XGI330_LCDDataStruct XGI_ExtLCD1280x1024Data[] = { { 211, 60,1024, 501,1688,1066}, { 211, 60,1024, 508,1688,1066}, @@ -1046,7 +1053,8 @@ struct XGI330_LCDDataStruct XGI_ExtLCD1280x1024Data[] = { 1, 1,1688,1066,1688,1066} }; -struct XGI330_LCDDataStruct XGI_St2LCD1280x1024Data[] = +#if 0 +static struct XGI330_LCDDataStruct XGI_St2LCD1280x1024Data[] = { { 22, 5, 800, 510,1650,1088}, { 22, 5, 800, 510,1650,1088}, @@ -1057,8 +1065,9 @@ struct XGI330_LCDDataStruct XGI_St2LCD1280x1024Data[] = { 16, 9,1266, 804,1688,1072}, { 1, 1,1688,1066,1688,1066} }; +#endif -struct XGI330_LCDDataStruct XGI_CetLCD1280x1024Data[] = +static struct XGI330_LCDDataStruct XGI_CetLCD1280x1024Data[] = { { 1,1,1688,1066,1688,1066 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1,1,1688,1066,1688,1066 }, /* 01 (320x350,640x350) */ @@ -1071,7 +1080,7 @@ struct XGI330_LCDDataStruct XGI_CetLCD1280x1024Data[] = { 1,1,1688,1066,1688,1066 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataStruct XGI_StLCD1400x1050Data[] = +static struct XGI330_LCDDataStruct XGI_StLCD1400x1050Data[] = { { 211,100,2100,408,1688,1066 }, /* 00 (320x200,320x400,640x200,640x400) */ { 211,64,1536,358,1688,1066 }, /* 01 (320x350,640x350) */ @@ -1084,7 +1093,7 @@ struct XGI330_LCDDataStruct XGI_StLCD1400x1050Data[] = { 1,1,1688,1066,1688,1066 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataStruct XGI_ExtLCD1400x1050Data[] = +static struct XGI330_LCDDataStruct XGI_ExtLCD1400x1050Data[] = { { 211,100,2100,408,1688,1066 }, /* 00 (320x200,320x400,640x200,640x400) */ { 211,64,1536,358,1688,1066 }, /* 01 (320x350,640x350) */ @@ -1097,7 +1106,7 @@ struct XGI330_LCDDataStruct XGI_ExtLCD1400x1050Data[] = { 1,1,1688,1066,1688,1066 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataStruct XGI_ExtLCD1600x1200Data[] = +static struct XGI330_LCDDataStruct XGI_ExtLCD1600x1200Data[] = { { 4,1,1620,420,2160,1250 }, /* { 3,1,2160,425,2160,1250 }, // 00 (320x200,320x400,640x200,640x400) // alan 10/14/2003 */ { 27,7,1920,375,2160,1250 }, /* 01 (320x350,640x350) */ @@ -1111,7 +1120,7 @@ struct XGI330_LCDDataStruct XGI_ExtLCD1600x1200Data[] = { 1,1,2160,1250,2160,1250 } /* 09 (1600x1200x60Hz) ;302lv */ }; -struct XGI330_LCDDataStruct XGI_StLCD1600x1200Data[] = +static struct XGI330_LCDDataStruct XGI_StLCD1600x1200Data[] = { { 27,4,800,500,2160,1250 },/* 00 (320x200,320x400,640x200,640x400) */ { 27,4,800,500,2160,1250 },/* 01 (320x350,640x350) */ @@ -1125,7 +1134,7 @@ struct XGI330_LCDDataStruct XGI_StLCD1600x1200Data[] = { 1,1,2160,1250,2160,1250 } /* 09 (1600x1200) */ }; -struct XGI330_LCDDataStruct XGI_CetLCD1400x1050Data[] = +static struct XGI330_LCDDataStruct XGI_CetLCD1400x1050Data[] = { { 1,1,1688,1066,1688,1066 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1,1,1688,1066,1688,1066 }, /* 01 (320x350,640x350) */ @@ -1138,7 +1147,7 @@ struct XGI330_LCDDataStruct XGI_CetLCD1400x1050Data[] = { 1,1,1688,1066,1688,1066 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataStruct XGI_NoScalingData[] = +static struct XGI330_LCDDataStruct XGI_NoScalingData[] = { { 1, 1, 800, 449, 800, 449}, { 1, 1, 800, 449, 800, 449}, @@ -1150,7 +1159,7 @@ struct XGI330_LCDDataStruct XGI_NoScalingData[] = { 1, 1,1688,1066,1688,1066} }; -struct XGI330_LCDDataStruct XGI_ExtLCD1024x768x75Data[] = +static struct XGI330_LCDDataStruct XGI_ExtLCD1024x768x75Data[] = { {42,25,1536,419,1344,806 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {48,25,1536,369,1344,806 }, /* ; 01 (320x350,640x350) */ @@ -1161,7 +1170,8 @@ struct XGI330_LCDDataStruct XGI_ExtLCD1024x768x75Data[] = {1,1,1312,800,1312,800 } /* ; 06 (1024x768x75Hz) */ }; -struct XGI330_LCDDataStruct XGI_StLCD1024x768x75Data[] = +#if 0 +static struct XGI330_LCDDataStruct XGI_StLCD1024x768x75Data[] = { {42,25,1536,419,1344,806 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {48,25,1536,369,1344,806 }, /* ; 01 (320x350,640x350) */ @@ -1171,8 +1181,9 @@ struct XGI330_LCDDataStruct XGI_StLCD1024x768x75Data[] = {41,25,1024,625,1312,800 }, /* ; 05 (800x600x75Hz) */ {1,1,1312,800,1312,800 } /* ; 06 (1024x768x75Hz) */ }; +#endif -struct XGI330_LCDDataStruct XGI_CetLCD1024x768x75Data[] = +static struct XGI330_LCDDataStruct XGI_CetLCD1024x768x75Data[] = { {1,1,1312,800,1312,800}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1,1,1312,800,1312,800}, /* ; 01 (320x350,640x350) */ @@ -1183,7 +1194,7 @@ struct XGI330_LCDDataStruct XGI_CetLCD1024x768x75Data[] = {1,1,1312,800,1312,800} /* ; 06 (1024x768x75Hz) */ }; -struct XGI330_LCDDataStruct XGI_ExtLCD1280x1024x75Data[] = +static struct XGI330_LCDDataStruct XGI_ExtLCD1280x1024x75Data[] = { {211,60,1024,501,1688,1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {211,60,1024,508,1688,1066 }, /* ; 01 (320x350,640x350) */ @@ -1195,7 +1206,7 @@ struct XGI330_LCDDataStruct XGI_ExtLCD1280x1024x75Data[] = {1,1,1688,1066,1688,1066 } /* ; 07 (1280x1024x75Hz) */ }; -struct XGI330_LCDDataStruct XGI_StLCD1280x1024x75Data[] = +static struct XGI330_LCDDataStruct XGI_StLCD1280x1024x75Data[] = { {211,60,1024,501,1688,1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {211,60,1024,508,1688,1066 }, /* ; 01 (320x350,640x350) */ @@ -1207,7 +1218,7 @@ struct XGI330_LCDDataStruct XGI_StLCD1280x1024x75Data[] = {1,1,1688,1066,1688,1066 } /* ; 07 (1280x1024x75Hz) */ }; -struct XGI330_LCDDataStruct XGI_CetLCD1280x1024x75Data[] = +static struct XGI330_LCDDataStruct XGI_CetLCD1280x1024x75Data[] = { {1,1,1688,1066,1688,1066}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1,1,1688,1066,1688,1066}, /* ; 01 (320x350,640x350) */ @@ -1219,7 +1230,7 @@ struct XGI330_LCDDataStruct XGI_CetLCD1280x1024x75Data[] = {1,1,1688,1066,1688,1066} /* ; 07 (1280x1024x75Hz) */ }; -struct XGI330_LCDDataStruct XGI_NoScalingDatax75[] = +static struct XGI330_LCDDataStruct XGI_NoScalingDatax75[] = { {1,1,800,449,800,449 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {1,1,800,449,800,449 }, /* ; 01 (320x350,640x350) */ @@ -1234,7 +1245,7 @@ struct XGI330_LCDDataStruct XGI_NoScalingDatax75[] = {1,1,1688,806,1688,806 } /* ; 0A (1280x768x75Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768Data[] = +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768Data[] = { { 9,1057,0, 771 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 9,1057,0, 771 }, /* ; 01 (320x350,640x350) */ @@ -1245,7 +1256,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768Data[] = { 9,1057,805, 770 } /* ; 06 (1024x768x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768Data[] = { { 9,1057,737,703 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 9,1057,686,651 }, /* ; 01 (320x350,640x350) */ @@ -1256,7 +1267,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768Data[] = { 9,1057,805,770 } /* ; 06 (1024x768x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768Data[] = +static struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768Data[] = { { 1152,856,622,587 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 1152,856,597,562 }, /* ; 01 (320x350,640x350) */ @@ -1267,7 +1278,7 @@ struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768Data[] = { 0,1048,805,770 } /* ; 06 (1024x768x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024Data[] = +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024Data[] = { { 18,1346,981,940 },/* 00 (320x200,320x400,640x200,640x400) */ { 18,1346,926,865 },/* 01 (320x350,640x350) */ @@ -1279,7 +1290,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024Data[] = { 18,1346,1065,1024 }/* 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024Data[] = { { 18,1346,970,907 },/* 00 (320x200,320x400,640x200,640x400) */ { 18,1346,917,854 },/* 01 (320x350,640x350) */ @@ -1291,7 +1302,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024Data[] = { 18,1346,1065,1024 }/* 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024Data[] = +static struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024Data[] = { { 1368,1008,752,711 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1368,1008,729,688 }, /* 01 (320x350,640x350) */ @@ -1303,7 +1314,7 @@ struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024Data[] = { 18,1346,1065,1024 } /* 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024Data[] = +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024Data[] = { { 9,1337,981,940 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 9,1337,926,884 }, /* ; 01 (320x350,640x350) alan, 2003/09/30 */ @@ -1315,7 +1326,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024Data[] = { 9,1337,1065,1024 } /* ; 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024Data[] = { { 9,1337,970,907 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 9,1337,917,854 }, /* ; 01 (320x350,640x350) */ @@ -1327,7 +1338,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024Data[] = { 9,1337,1065,1024 } /* ; 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024Data[] = +static struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024Data[] = { { 1368,1008,752,711 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1368,1008,729,688 }, /* 01 (320x350,640x350) */ @@ -1339,7 +1350,7 @@ struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024Data[] = { 9,1337,1065,1024 } /* 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1400x1050Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1400x1050Data[] = { { 18,1464,0,1051 }, /* 00 (320x200,320x400,640x200,640x400) */ { 18,1464,0,1051 }, /* 01 (320x350,640x350) */ @@ -1352,7 +1363,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1400x1050Data[] = { 18,1464,0,1051 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1400x1050Data[] = +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1400x1050Data[] = { { 18,1464,0,1051 }, /* 00 (320x200,320x400,640x200,640x400) */ { 18,1464,0,1051 }, /* 01 (320x350,640x350) */ @@ -1365,7 +1376,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1400x1050Data[] = { 18,1464,0,1051 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDes1400x1050Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDes1400x1050Data[] = { { 9,1455,0,1051 },/* 00 (320x200,320x400,640x200,640x400) */ { 9,1455,0,1051 },/* 01 (320x350,640x350) */ @@ -1378,7 +1389,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDes1400x1050Data[] = { 9,1455,0,1051 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1400x1050Data[] = +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1400x1050Data[] = { { 9,1455,0,1051 },/* 00 (320x200,320x400,640x200,640x400) */ { 9,1455,0,1051 },/* 01 (320x350,640x350) */ @@ -1391,7 +1402,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1400x1050Data[] = { 9,1455,0,1051 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data[] = +static struct XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data[] = { { 1308,1068,781,766 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1308,1068,781,766 }, /* 01 (320x350,640x350) */ @@ -1404,7 +1415,7 @@ struct XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data[] = { 18,1464,0,1051 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data2[] = +static struct XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data2[] = { { 0,1448,0,1051 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1448,0,1051 }, /* 01 (320x350,640x350) */ @@ -1415,7 +1426,7 @@ struct XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data2[] = -struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1600x1200Data[] = +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1600x1200Data[] = { { 18,1682,0,1201 }, /* 00 (320x200,320x400,640x200,640x400) */ { 18,1682,0,1201 }, /* 01 (320x350,640x350) */ @@ -1429,7 +1440,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1600x1200Data[] = { 18,1682,0,1201 } /* 09 (1600x1200x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1600x1200Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1600x1200Data[] = { { 18,1682,1150,1101 }, /* 00 (320x200,320x400,640x200,640x400) */ { 18,1682,1083,1034 }, /* 01 (320x350,640x350) */ @@ -1443,7 +1454,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1600x1200Data[] = { 18,1682,0,1201 } /* 09 (1600x1200x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1600x1200Data[] = +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1600x1200Data[] = { { 9,1673,0,1201 },/* 00 (320x200,320x400,640x200,640x400) */ { 9,1673,0,1201 },/* 01 (320x350,640x350) */ @@ -1457,7 +1468,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1600x1200Data[] = { 9,1673,0,1201 } /* 09 (1600x1200x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDes1600x1200Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDes1600x1200Data[] = { { 9,1673,1150,1101 },/* 00 (320x200,320x400,640x200,640x400) */ { 9,1673,1083,1034 },/* 01 (320x350,640x350) */ @@ -1471,7 +1482,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDes1600x1200Data[] = { 9,1673,0,1201 } /* 09 (1600x1200x60Hz) */ }; -struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesData[] = +static struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesData[] = { { 9,657,448,405,96,2 }, /* 00 (320x200,320x400,640x200,640x400) */ { 9,657,448,355,96,2 }, /* 01 (320x350,640x350) */ @@ -1486,7 +1497,7 @@ struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesData[] = { 9,1337,0,771,112,6 } /* 0A (1280x768x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768x75Data[] = /* ;;1024x768x75Hz */ +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768x75Data[] = /* ;;1024x768x75Hz */ { {9,1049,0,769}, /* ; 00 (320x200,320x400,640x200,640x400) */ {9,1049,0,769}, /* ; 01 (320x350,640x350) */ @@ -1497,7 +1508,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768x75Data[] = /* ;;1024x768x {9,1049,0,769} /* ; 06 (1024x768x75Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768x75Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768x75Data[] = { {9,1049,0,769}, /* ; 00 (320x200,320x400,640x200,640x400) */ {9,1049,0,769}, /* ; 01 (320x350,640x350) */ @@ -1508,7 +1519,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768x75Data[] = {9,1049,0,769} /* ; 06 (1024x768x75Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768x75Data[] = /* ;;1024x768x75Hz */ +static struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768x75Data[] = /* ;;1024x768x75Hz */ { {1152,856,622,587}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1152,856,597,562}, /* ; 01 (320x350,640x350) */ @@ -1519,7 +1530,7 @@ struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768x75Data[] = /* ;;1024x768x7 {9,1049,0,769} /* ; 06 (1024x768x75Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024x75Data[] = /* ;;1280x1024x75Hz */ +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024x75Data[] = /* ;;1280x1024x75Hz */ { {18,1314,0,1025 },/* ; 00 (320x200,320x400,640x200,640x400) */ {18,1314,0,1025 },/* ; 01 (320x350,640x350) */ @@ -1531,7 +1542,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024x75Data[] = /* ; {18,1314,0,1025 }/* ; 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024x75Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024x75Data[] = { {18,1314,0,1025 },/* ; 00 (320x200,320x400,640x200,640x400) */ {18,1314,0,1025 },/* ; 01 (320x350,640x350) */ @@ -1543,7 +1554,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024x75Data[] = {18,1314,0,1025 }/* ; 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024x75Data[] = /* 1280x1024x75Hz */ +static struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024x75Data[] = /* 1280x1024x75Hz */ { {1368,1008,752,711}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1368,1008,729,688}, /* ; 01 (320x350,640x350) */ @@ -1555,7 +1566,7 @@ struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024x75Data[] = /* 1280x1024 {18,1314,0,1025} /* ; 07 (1280x1024x75Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024x75Data[] = /* ;;1280x1024x75Hz */ +static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024x75Data[] = /* ;;1280x1024x75Hz */ { {9,1305,0,1025},/* ; 00 (320x200,320x400,640x200,640x400) */ {9,1305,0,1025},/* ; 01 (320x350,640x350) */ @@ -1567,7 +1578,7 @@ struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024x75Data[] = /* ;;1 {9,1305,0,1025} /* ; 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024x75Data[] = +static struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024x75Data[] = { {9,1305,0,1025},/* ; 00 (320x200,320x400,640x200,640x400) */ {9,1305,0,1025},/* ; 01 (320x350,640x350) */ @@ -1579,7 +1590,7 @@ struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024x75Data[] = {9,1305,0,1025} /* ; 07 (1280x1024x60Hz) */ }; -struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024x75Data[] = /* 1280x1024x75Hz */ +static struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024x75Data[] = /* 1280x1024x75Hz */ { {1368,1008,752,711}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1368,1008,729,688}, /* ; 01 (320x350,640x350) */ @@ -1591,7 +1602,7 @@ struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024x75Data[] = /* 1280x1024x7 {9,1305,0,1025} /* ; 07 (1280x1024x75Hz) */ }; -struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesDatax75[] = /* Scaling LCD 75Hz */ +static struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesDatax75[] = /* Scaling LCD 75Hz */ { {9,657,448,405,96,2}, /* ; 00 (320x200,320x400,640x200,640x400) */ {9,657,448,355,96,2}, /* ; 01 (320x350,640x350) */ @@ -1606,7 +1617,7 @@ struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesDatax75[] = /* Scaling LCD 75Hz {9,1337,0,771,112,6} /* ; 0A (1280x768x60Hz) */ }; -struct XGI330_TVDataStruct XGI_StPALData[] = +static struct XGI330_TVDataStruct XGI_StPALData[] = { { 1, 1, 864, 525,1270, 400, 100, 0, 760}, { 1, 1, 864, 525,1270, 350, 100, 0, 760}, @@ -1616,7 +1627,7 @@ struct XGI330_TVDataStruct XGI_StPALData[] = { 1, 1, 864, 525,1270, 600, 50, 0, 0} }; -struct XGI330_TVDataStruct XGI_ExtPALData[] = +static struct XGI330_TVDataStruct XGI_ExtPALData[] = { { 2, 1,1080, 463,1270, 500, 50, 0, 50}, { 15, 7,1152, 413,1270, 500, 50, 0, 50}, @@ -1628,7 +1639,7 @@ struct XGI330_TVDataStruct XGI_ExtPALData[] = { 3, 2,1080, 619,1270, 540, 438, 0, 438} }; -struct XGI330_TVDataStruct XGI_StNTSCData[] = +static struct XGI330_TVDataStruct XGI_StNTSCData[] = { { 1, 1, 858, 525,1270, 400, 50, 0, 760}, { 1, 1, 858, 525,1270, 350, 50, 0, 640}, @@ -1637,7 +1648,7 @@ struct XGI330_TVDataStruct XGI_StNTSCData[] = { 1, 1, 858, 525,1270, 480, 0, 0, 760} }; -struct XGI330_TVDataStruct XGI_ExtNTSCData[] = +static struct XGI330_TVDataStruct XGI_ExtNTSCData[] = { { 9, 5, 1001, 453,1270, 420, 171, 0, 171}, { 12, 5, 858, 403,1270, 420, 171, 0, 171}, @@ -1650,7 +1661,7 @@ struct XGI330_TVDataStruct XGI_ExtNTSCData[] = { 3, 2,1001, 533,1270, 420, 0, 0, 0} }; -struct XGI330_TVDataStruct XGI_St1HiTVData[] = +static struct XGI330_TVDataStruct XGI_St1HiTVData[] = { { 1,1,892,563,690,800,0,0,0 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1,1,892,563,690,700,0,0,0 }, /* 01 (320x350,640x350) */ @@ -1660,7 +1671,7 @@ struct XGI330_TVDataStruct XGI_St1HiTVData[] = { 8,5,1050,683,1648,960,0x150,1,0 } /* 05 (400x300,800x600) */ }; -struct XGI330_TVDataStruct XGI_St2HiTVData[] = +static struct XGI330_TVDataStruct XGI_St2HiTVData[] = { { 3,1,840,483,1648,960,0x032,0,0 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1,1,892,563,690,700,0,0,0 }, /* 01 (320x350,640x350) */ @@ -1671,7 +1682,7 @@ struct XGI330_TVDataStruct XGI_St2HiTVData[] = }; -struct XGI330_TVDataStruct XGI_ExtHiTVData[] = +static struct XGI330_TVDataStruct XGI_ExtHiTVData[] = { { 6,1,840,563,1632,960,0,0,0 }, /* 00 (320x200,320x400,640x200,640x400) */ { 3,1,960,563,1632,960,0,0,0 }, /* 01 (320x350,640x350) */ @@ -1687,7 +1698,7 @@ struct XGI330_TVDataStruct XGI_ExtHiTVData[] = }; -struct XGI330_TVDataStruct XGI_ExtYPbPr525iData[] = +static struct XGI330_TVDataStruct XGI_ExtYPbPr525iData[] = { { 9, 5, 1001, 453,1270, 420, 171, 0, 171}, { 12, 5, 858, 403,1270, 420, 171, 0, 171}, @@ -1700,7 +1711,7 @@ struct XGI330_TVDataStruct XGI_ExtYPbPr525iData[] = { 3, 2,1001, 533,1250, 420, 0, 0, 0} }; -struct XGI330_TVDataStruct XGI_StYPbPr525iData[] = +static struct XGI330_TVDataStruct XGI_StYPbPr525iData[] = { { 1, 1, 858, 525,1270, 400, 50, 0, 760}, { 1, 1, 858, 525,1270, 350, 50, 0, 640}, @@ -1709,7 +1720,7 @@ struct XGI330_TVDataStruct XGI_StYPbPr525iData[] = { 1, 1, 858, 525,1270, 480, 0, 0, 760}, }; -struct XGI330_TVDataStruct XGI_ExtYPbPr525pData[] = +static struct XGI330_TVDataStruct XGI_ExtYPbPr525pData[] = { { 9, 5, 1001, 453,1270, 420, 171, 0, 171}, { 12, 5, 858, 403,1270, 420, 171, 0, 171}, @@ -1722,7 +1733,7 @@ struct XGI330_TVDataStruct XGI_ExtYPbPr525pData[] = { 3, 2,1001, 533,1270, 420, 0, 0, 0} }; -struct XGI330_TVDataStruct XGI_StYPbPr525pData[] = +static struct XGI330_TVDataStruct XGI_StYPbPr525pData[] = { { 1, 1,1716, 525,1270, 400, 50, 0, 760}, { 1, 1,1716, 525,1270, 350, 50, 0, 640}, @@ -1731,7 +1742,7 @@ struct XGI330_TVDataStruct XGI_StYPbPr525pData[] = { 1, 1,1716, 525,1270, 480, 0, 0, 760}, }; -struct XGI330_TVDataStruct XGI_ExtYPbPr750pData[] = +static struct XGI330_TVDataStruct XGI_ExtYPbPr750pData[] = { { 3, 1, 935, 470,1130, 680, 50, 0, 0}, /* 00 (320x200,320x400,640x200,640x400) */ { 24, 7, 935, 420,1130, 680, 50, 0, 0}, /* 01 (320x350,640x350) */ @@ -1746,7 +1757,7 @@ struct XGI330_TVDataStruct XGI_ExtYPbPr750pData[] = { 10, 9,1320, 830,1130, 640, 50, 0, 0} }; -struct XGI330_TVDataStruct XGI_StYPbPr750pData[] = +static struct XGI330_TVDataStruct XGI_StYPbPr750pData[] = { { 1, 1,1650, 750,1280, 400, 50, 0, 760}, { 1, 1,1650, 750,1280, 350, 50, 0, 640}, @@ -1755,7 +1766,7 @@ struct XGI330_TVDataStruct XGI_StYPbPr750pData[] = { 1, 1,1650, 750,1280, 480, 0, 0, 760}, }; -unsigned char XGI330_NTSCTiming[] = { +static unsigned char XGI330_NTSCTiming[] = { 0x17,0x1d,0x03,0x09,0x05,0x06,0x0c,0x0c, 0x94,0x49,0x01,0x0a,0x06,0x0d,0x04,0x0a, 0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x1b, @@ -1765,7 +1776,7 @@ unsigned char XGI330_NTSCTiming[] = { 0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x50, 0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00}; -unsigned char XGI330_PALTiming[] = { +static unsigned char XGI330_PALTiming[] = { 0x21,0x5A,0x35,0x6e,0x04,0x38,0x3d,0x70, 0x94,0x49,0x01,0x12,0x06,0x3e,0x35,0x6d, 0x06,0x14,0x3e,0x35,0x6d,0x00,0x45,0x2b, @@ -1775,7 +1786,7 @@ unsigned char XGI330_PALTiming[] = { 0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x63, 0x00,0x40,0x3e,0x00,0xe1,0x02,0x28,0x00}; -unsigned char XGI330_HiTVExtTiming[] = +static unsigned char XGI330_HiTVExtTiming[] = { 0x2D,0x60,0x2C,0x5F,0x08,0x31,0x3A,0x64, 0x28,0x02,0x01,0x3D,0x06,0x3E,0x35,0x6D, @@ -1789,7 +1800,7 @@ unsigned char XGI330_HiTVExtTiming[] = }; -unsigned char XGI330_HiTVSt1Timing[] = +static unsigned char XGI330_HiTVSt1Timing[] = { 0x32,0x65,0x2C,0x5F,0x08,0x31,0x3A,0x65, 0x28,0x02,0x01,0x3D,0x06,0x3E,0x35,0x6D, @@ -1802,7 +1813,7 @@ unsigned char XGI330_HiTVSt1Timing[] = 0x0E,0x00,0xfc,0xff,0x2d,0x00 }; -unsigned char XGI330_HiTVSt2Timing[] = +static unsigned char XGI330_HiTVSt2Timing[] = { 0x32,0x65,0x2C,0x5F,0x08,0x31,0x3A,0x64, 0x28,0x02,0x01,0x3D,0x06,0x3E,0x35,0x6D, @@ -1815,7 +1826,7 @@ unsigned char XGI330_HiTVSt2Timing[] = 0x27,0x00,0xFC,0xff,0x6a,0x00 }; -unsigned char XGI330_HiTVTextTiming[] = +static unsigned char XGI330_HiTVTextTiming[] = { 0x32,0x65,0x2C,0x5F,0x08,0x31,0x3A,0x65, 0x28,0x02,0x01,0x3D,0x06,0x3E,0x35,0x6D, @@ -1828,7 +1839,7 @@ unsigned char XGI330_HiTVTextTiming[] = 0x11,0x00,0xFC,0xFF,0x32,0x00 }; -unsigned char XGI330_YPbPr750pTiming[] = +static unsigned char XGI330_YPbPr750pTiming[] = { 0x30,0x1d,0xe8,0x09,0x09,0xed,0x0c,0x0c, 0x98,0x0a,0x01,0x0c,0x06,0x0d,0x04,0x0a, @@ -1841,7 +1852,7 @@ unsigned char XGI330_YPbPr750pTiming[] = 0x11,0x00,0xfc,0xff,0x32,0x00 }; -unsigned char XGI330_YPbPr525pTiming[] = +static unsigned char XGI330_YPbPr525pTiming[] = { 0x3E,0x11,0x06,0x09,0x0b,0x0c,0x0c,0x0c, 0x98,0x0a,0x01,0x0d,0x06,0x0d,0x04,0x0a, @@ -1854,7 +1865,7 @@ unsigned char XGI330_YPbPr525pTiming[] = 0x11,0x00,0xFC,0xFF,0x32,0x00 }; -unsigned char XGI330_YPbPr525iTiming[] = +static unsigned char XGI330_YPbPr525iTiming[] = { 0x1B,0x21,0x03,0x09,0x05,0x06,0x0C,0x0C, 0x94,0x49,0x01,0x0A,0x06,0x0D,0x04,0x0A, @@ -1868,7 +1879,7 @@ unsigned char XGI330_YPbPr525iTiming[] = }; -unsigned char XGI330_HiTVGroup3Data[] = +static unsigned char XGI330_HiTVGroup3Data[] = { 0x00,0x1A,0x22,0x63,0x62,0x22,0x08,0x5F, 0x05,0x21,0xB2,0xB2,0x55,0x77,0x2A,0xA6, @@ -1880,7 +1891,7 @@ unsigned char XGI330_HiTVGroup3Data[] = 0x18,0x05,0x18,0x05,0x4C,0xA8,0x01 }; -unsigned char XGI330_HiTVGroup3Simu[] = +static unsigned char XGI330_HiTVGroup3Simu[] = { 0x00,0x1A,0x22,0x63,0x62,0x22,0x08,0x95, 0xDB,0x20,0xB8,0xB8,0x55,0x47,0x2A,0xA6, @@ -1892,7 +1903,7 @@ unsigned char XGI330_HiTVGroup3Simu[] = 0x18,0x05,0x18,0x05,0x4C,0xA8,0x01 }; -unsigned char XGI330_HiTVGroup3Text[] = +static unsigned char XGI330_HiTVGroup3Text[] = { 0x00,0x1A,0x22,0x63,0x62,0x22,0x08,0xA7, 0xF5,0x20,0xCE,0xCE,0x55,0x47,0x2A,0xA6, @@ -1904,7 +1915,7 @@ unsigned char XGI330_HiTVGroup3Text[] = 0x18,0x05,0x18,0x05,0x4C,0xA8,0x01 }; -unsigned char XGI330_Ren525pGroup3[] = +static unsigned char XGI330_Ren525pGroup3[] = { 0x00,0x14,0x15,0x25,0x55,0x15,0x0b,0x13, 0xB1,0x41,0x62,0x62,0xFF,0xF4,0x45,0xa6, @@ -1916,7 +1927,7 @@ unsigned char XGI330_Ren525pGroup3[] = 0x1a,0x1F,0x25,0x2a,0x4C,0xAA,0x01 }; -unsigned char XGI330_Ren750pGroup3[] = +static unsigned char XGI330_Ren750pGroup3[] = { 0x00,0x14,0x15,0x25,0x55,0x15,0x0b,0x7a, 0x54,0x41,0xE7,0xE7,0xFF,0xF4,0x45,0xa6, @@ -1928,7 +1939,8 @@ unsigned char XGI330_Ren750pGroup3[] = 0x18,0x1D,0x23,0x28,0x4C,0xAA,0x01 }; -struct XGI_PanelDelayTblStruct XGI330_PanelDelayTbl[] = +#if 0 +static struct XGI_PanelDelayTblStruct XGI330_PanelDelayTbl[] = { {{0x00,0x00}}, {{0x00,0x00}}, @@ -1948,7 +1960,7 @@ struct XGI_PanelDelayTblStruct XGI330_PanelDelayTbl[] = {{0x00,0x00}} }; -struct XGI330_LVDSDataStruct XGI330_LVDS320x480Data_1[] = +static struct XGI330_LVDSDataStruct XGI330_LVDS320x480Data_1[] = { {848, 433,400,525}, {848, 389,400,525}, @@ -1961,7 +1973,7 @@ struct XGI330_LVDSDataStruct XGI330_LVDS320x480Data_1[] = {800, 525,1000, 635} }; -struct XGI330_LVDSDataStruct XGI330_LVDS800x600Data_1[] = +static struct XGI330_LVDSDataStruct XGI330_LVDS800x600Data_1[] = { {848, 433,1060, 629}, {848, 389,1060, 629}, @@ -1974,7 +1986,7 @@ struct XGI330_LVDSDataStruct XGI330_LVDS800x600Data_1[] = {800, 525,1000, 635} }; -struct XGI330_LVDSDataStruct XGI330_LVDS800x600Data_2[] = +static struct XGI330_LVDSDataStruct XGI330_LVDS800x600Data_2[] = { {1056, 628,1056, 628}, {1056, 628,1056, 628}, @@ -1986,8 +1998,9 @@ struct XGI330_LVDSDataStruct XGI330_LVDS800x600Data_2[] = {800, 449,1000, 644}, {800, 525,1000, 635} }; +#endif -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1[] = { { 960 , 438 , 1344 , 806 } , /* 00 (320x200,320x400,640x200,640x400) */ { 960 , 388 , 1344 , 806 } , /* 01 (320x350,640x350) */ @@ -1999,7 +2012,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1[] = }; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2[] = { {1344, 806,1344, 806}, {1344, 806,1344, 806}, @@ -2012,7 +2025,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2[] = {800, 525,1280, 813} }; -struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1[] = { {1048, 442,1688, 1066}, {1048, 392,1688, 1066}, @@ -2024,7 +2037,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1[] = {1688, 1066,1688, 1066} }; -struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2[] = { {1344, 806,1344, 806}, {1344, 806,1344, 806}, @@ -2115,7 +2128,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1280x768SData_2[] = {1688,806,1688,806} }; */ -struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_1[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_1[] = { {928,416,1688,1066}, {928,366,1688,1066}, @@ -2128,7 +2141,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_1[] = {1688,1066,1688,1066} }; -struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_2[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_2[] = { {1688,1066,1688,1066}, {1688,1066,1688,1066}, @@ -2141,7 +2154,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_2[] = {1688,1066,1688,1066} }; -struct XGI330_LVDSDataStruct XGI_LVDS1600x1200Data_1[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1600x1200Data_1[] = { /* ;;[ycchen] 12/05/02 LCDHTxLCDVT=2048x1320 */ { 1088,520,2048,1320 },/* 00 (320x200,320x400,640x200,640x400) */ { 1088,470,2048,1320 },/* 01 (320x350,640x350) */ @@ -2155,7 +2168,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1600x1200Data_1[] = { 2048,1320,2048,1320 } /* 09 (1600x1200) */ }; -struct XGI330_LVDSDataStruct XGI_LVDSNoScalingData[] = +static struct XGI330_LVDSDataStruct XGI_LVDSNoScalingData[] = { { 800,449,800,449 }, /* 00 (320x200,320x400,640x200,640x400) */ { 800,449,800,449 }, /* 01 (320x350,640x350) */ @@ -2170,7 +2183,7 @@ struct XGI330_LVDSDataStruct XGI_LVDSNoScalingData[] = { 1688,806,1688,806 } /* 0A (1280x768x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1x75[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1x75[] = { {960,438,1312,800 }, /* 00 (320x200,320x400,640x200,640x400) */ {960,388,1312,800 }, /* 01 (320x350,640x350) */ @@ -2182,7 +2195,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1x75[] = }; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2x75[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2x75[] = { {1312,800,1312,800}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1312,800,1312,800}, /* ; 01 (320x350,640x350) */ @@ -2193,7 +2206,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2x75[] = {1312,800,1312,800}, /* ; 06 (512x384,1024x768) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1x75[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1x75[] = { {1048,442,1688,1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {1048,392,1688,1066 }, /* ; 01 (320x350,640x350) */ @@ -2205,7 +2218,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1x75[] = {1688,1066,1688,1066 }, /* ; 06; 07 (640x512,1280x1024) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2x75[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2x75[] = { {1688,1066,1688,1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {1688,1066,1688,1066 }, /* ; 01 (320x350,640x350) */ @@ -2217,7 +2230,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2x75[] = {1688,1066,1688,1066 }, /* ; 06; 07 (640x512,1280x1024) */ }; -struct XGI330_LVDSDataStruct XGI_LVDSNoScalingDatax75[] = +static struct XGI330_LVDSDataStruct XGI_LVDSNoScalingDatax75[] = { {800,449,800,449 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {800,449,800,449 }, /* ; 01 (320x350,640x350) */ @@ -2232,7 +2245,7 @@ struct XGI330_LVDSDataStruct XGI_LVDSNoScalingDatax75[] = {1688,806,1688,806 }, /* ; 0A (1280x768x75Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1[] = { { 0,1048, 0, 771 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1048, 0, 771 }, /* 01 (320x350,640x350) */ @@ -2243,7 +2256,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1[] = { 0,1048, 805, 770 } /* 06 (1024x768x60Hz) */ } ; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2[] = { { 1142, 856, 622, 587 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1142, 856, 597, 562 }, /* 01 (320x350,640x350) */ @@ -2254,7 +2267,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2[] = { 0,1048, 805, 771 } /* 06 (1024x768x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3[] = { { 320, 24, 622, 587 }, /* 00 (320x200,320x400,640x200,640x400) */ { 320, 24, 597, 562 }, /* 01 (320x350,640x350) */ @@ -2263,7 +2276,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3[] = { 320, 24, 722, 687 } /* 04 (640x480x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1[] = { { 0,1328, 0, 1025 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1328, 0, 1025 }, /* 01 (320x350,640x350) */ @@ -2276,7 +2289,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1[] = }; /* The Display setting for DE Mode Panel */ -struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2[] = { { 1368,1008,752,711 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1368,1008,729,688 }, /* 01 (320x350,640x350) */ @@ -2288,7 +2301,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2[] = { 0000,1328,0,1025 } /* 07 (1280x1024x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_1[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_1[] = { { 0,1448,0,1051 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1448,0,1051 }, /* 01 (320x350,640x350) */ @@ -2301,7 +2314,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_1[] = { 0,1448,0,1051 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_2[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_2[] = { { 1308,1068, 781, 766 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1308,1068, 781, 766 }, /* 01 (320x350,640x350) */ @@ -2314,7 +2327,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_2[] = { 0,1448,0,1051 } /* 08 (1400x1050x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1600x1200Des_1[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1600x1200Des_1[] = { { 0,1664,0,1201 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1664,0,1201 }, /* 01 (320x350,640x350) */ @@ -2330,7 +2343,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1600x1200Des_1[] = -struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesData[] = +static struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesData[] = { { 0, 648, 448, 405, 96, 2 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0, 648, 448, 355, 96, 2 }, /* 01 (320x350,640x350) */ @@ -2345,7 +2358,7 @@ struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesData[] = { 0,1328,0,0771, 112, 6 } /* 0A (1280x768x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1x75[] = /* ; 1024x768 Full-screen */ +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1x75[] = /* ; 1024x768 Full-screen */ { {0,1040,0,769}, /* ; 00 (320x200,320x400,640x200,640x400) */ {0,1040,0,769}, /* ; 01 (320x350,640x350) */ @@ -2356,7 +2369,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1x75[] = /* ; 1024x768 Full-s {0,1040,0,769} /* ; 06 (1024x768x75Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2x75[] = /* ; 1024x768 center-screen (Enh. Mode) */ +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2x75[] = /* ; 1024x768 center-screen (Enh. Mode) */ { {1142, 856,622,587 }, /* 00 (320x200,320x400,640x200,640x400) */ {1142, 856,597,562 }, /* 01 (320x350,640x350) */ @@ -2367,7 +2380,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2x75[] = /* ; 1024x768 center-s { 0,1048,805,771 } /* 06 (1024x768x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3x75[] = /* ; 1024x768 center-screen (St.Mode) */ +static struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3x75[] = /* ; 1024x768 center-screen (St.Mode) */ { {320,24,622,587 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {320,24,597,562 }, /* ; 01 (320x350,640x350) */ @@ -2376,7 +2389,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3x75[] = /* ; 1024x768 center-s {320,24,722,687 } /* ; 04 (640x480x60Hz) */ }; -struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1x75[] = +static struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1x75[] = { {0,1296,0,1025}, /* ; 00 (320x200,320x400,640x200,640x400) */ {0,1296,0,1025}, /* ; 01 (320x350,640x350) */ @@ -2389,7 +2402,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1x75[] = }; /* The Display setting for DE Mode Panel */ -struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2x75[] = /* [ycchen] 02/18/03 Set DE as default */ +static struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2x75[] = /* [ycchen] 02/18/03 Set DE as default */ { {1368,976,752,711 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {1368,976,729,688 }, /* ; 01 (320x350,640x350) */ @@ -2401,7 +2414,7 @@ struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2x75[] = /* [ycchen] 02/18/0 {0,1296,0,1025 } /* ; 07 (1280x1024x75Hz) */ }; -struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[] = /* Scaling LCD 75Hz */ +static struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[] = /* Scaling LCD 75Hz */ { { 0,648,448,405,96,2 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 0,648,448,355,96,2 }, /* ; 01 (320x350,640x350) */ @@ -2416,7 +2429,8 @@ struct XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[] = /* Scaling LCD { 0,1328,0,771,112,6 } /* ; 0A (1280x768x75Hz) */ }; -struct XGI330_LVDSDataStruct XGI330_LVDS640x480Data_1[] = +#if 0 +static struct XGI330_LVDSDataStruct XGI330_LVDS640x480Data_1[] = { {800, 449, 800, 449}, {800, 449, 800, 449}, @@ -2428,8 +2442,9 @@ struct XGI330_LVDSDataStruct XGI330_LVDS640x480Data_1[] = {1056, 628,1056, 628}, {1056, 628,1056, 628} }; +#endif -struct XGI330_CHTVDataStruct XGI_CHTVUNTSCData[] = +static struct XGI330_CHTVDataStruct XGI_CHTVUNTSCData[] = { {840, 600, 840, 600}, {840, 600, 840, 600}, @@ -2439,7 +2454,7 @@ struct XGI330_CHTVDataStruct XGI_CHTVUNTSCData[] = {1064, 750,1064, 750} }; -struct XGI330_CHTVDataStruct XGI_CHTVONTSCData[] = +static struct XGI330_CHTVDataStruct XGI_CHTVONTSCData[] = { {840, 525, 840, 525}, {840, 525, 840, 525}, @@ -2449,7 +2464,7 @@ struct XGI330_CHTVDataStruct XGI_CHTVONTSCData[] = {1040, 700,1040, 700} }; -struct XGI330_CHTVDataStruct XGI_CHTVUPALData[] = +static struct XGI330_CHTVDataStruct XGI_CHTVUPALData[] = { {1008, 625,1008, 625}, {1008, 625,1008, 625}, @@ -2459,7 +2474,7 @@ struct XGI330_CHTVDataStruct XGI_CHTVUPALData[] = {936, 836, 936, 836} }; -struct XGI330_CHTVDataStruct XGI_CHTVOPALData[] = +static struct XGI330_CHTVDataStruct XGI_CHTVOPALData[] = { {1008, 625,1008, 625}, {1008, 625,1008, 625}, @@ -2469,7 +2484,7 @@ struct XGI330_CHTVDataStruct XGI_CHTVOPALData[] = {960, 750, 960, 750} }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_H[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_H[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x4B,0x27,0x8F,0x32,0x1B,0x00,0x45,0x00 }}, /* 00 (320x) */ @@ -2482,7 +2497,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_H[] = {{ 0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* 07 (1024x) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_H[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_H[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x56,0x27,0x9A,0x30,0x1E,0x00,0x05,0x00 }}, /* 00 (320x) */ @@ -2496,7 +2511,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_H[] = {{ 0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* 08 (1280x) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_H[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_H[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x63,0x27,0x87,0x3B,0x8C,0x00,0x01,0x00 }}, /* 00 (320x) */ @@ -2509,7 +2524,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_H[] = {{ 0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* 07 (1024x) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_H[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_H[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x7E,0x3B,0x9A,0x44,0x12,0x00,0x01,0x00 }}, /* 00 (320x) */ @@ -2523,7 +2538,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_H[] = {{ 0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* 08 (1280x) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x47,0x27,0x8B,0x2C,0x1A,0x00,0x05,0x00 }}, /* 00 (320x) */ {{ 0x47,0x27,0x8B,0x30,0x1E,0x00,0x05,0x00 }}, /* 01 (360x) */ @@ -2537,7 +2552,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[] = {{ 0xCE,0xAE,0x92,0xB3,0x01,0x00,0x03,0x00 }} /* 09 (1400x) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x76,0x3F,0x83,0x45,0x8C,0x00,0x41,0x00 }}, /* 00 (320x) */ {{ 0x76,0x3F,0x83,0x45,0x8C,0x00,0x41,0x00 }}, /* 01 (360x) */ @@ -2551,7 +2566,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[] = {{ 0xCE,0xAE,0x92,0xBC,0x0A,0x00,0x03,0x00 }} /* 09 (1400x) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[] = /* ;302lv channelA [ycchen] 12/05/02 LCDHT=2048 */ { /* ; CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x5B,0x27,0x9F,0x32,0x0A,0x00,0x01,0x00 }},/* 00 (320x) */ @@ -2567,7 +2582,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[] = {{ 0xFB,0xC7,0x9F,0xC9,0x81,0x00,0x07,0x00 }} /* 0A (1600x) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */ {{ 0x97,0x1F,0x60,0x87,0x5D,0x83,0x10 }}, /* 00 (x350) */ {{ 0xB4,0x1F,0x92,0x89,0x8F,0xB5,0x30 }}, /* 01 (x400) */ @@ -2576,7 +2591,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[] = {{ 0x24,0xF5,0x02,0x88,0xFF,0x25,0x90 }} /* 04 (x768) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */ {{ 0x24,0xBB,0x31,0x87,0x5D,0x25,0x30 }}, /* 00 (x350) */ {{ 0x24,0xBB,0x4A,0x80,0x8F,0x25,0x30 }}, /* 01 (x400) */ @@ -2585,7 +2600,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[] = {{ 0x24,0xF5,0x02,0x88,0xFF,0x25,0x90 }} /* 04 (x768) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */ {{ 0x86,0x1F,0x5E,0x82,0x5D,0x87,0x00 }}, /* 00 (x350) */ {{ 0xB8,0x1F,0x90,0x84,0x8F,0xB9,0x30 }}, /* 01 (x400) */ @@ -2595,7 +2610,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[] = {{ 0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9 }} /* 05 (x1024) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */ {{ 0x28,0xD2,0xAF,0x83,0xAE,0xD8,0xA1 }}, /* 00 (x350) */ {{ 0x28,0xD2,0xC8,0x8C,0xC7,0xF2,0x81 }}, /* 01 (x400) */ @@ -2605,7 +2620,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[] = {{ 0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9 }} /* 05 (x1024) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */ {{ 0x6C,0x1F,0x60,0x84,0x5D,0x6D,0x10 }}, /* 00 (x350) */ {{ 0x9E,0x1F,0x93,0x86,0x8F,0x9F,0x30 }}, /* 01 (x400) */ @@ -2616,7 +2631,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[] = {{ 0x28,0x10,0x1A,0x80,0x19,0x29,0x0F }} /* 06 (x1050) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */ {{ 0x28,0x92,0xB6,0x83,0xB5,0xCF,0x81 }}, /* 00 (x350) */ {{ 0x28,0x92,0xD5,0x82,0xD4,0xEE,0x81 }}, /* 01 (x400) */ @@ -2627,7 +2642,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[] = {{ 0x28,0x10,0x1A,0x87,0x19,0x29,0x8F }} /* 06 (x1050) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */ {{ 0xd4,0x1F,0x81,0x84,0x5D,0xd5,0x10 }}, /* 00 (x350) */ @@ -2640,7 +2655,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[] = {{ 0x26,0x11,0xd3,0x86,0xaF,0x27,0x3f }} /* 07 (x1200) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x4B,0x27,0x8F,0x32,0x1B,0x00,0x45,0x00 }},/* ; 00 (320x) */ {{ 0x4B,0x27,0x8F,0x2B,0x03,0x00,0x44,0x00 }},/* ; 01 (360x) */ @@ -2652,7 +2667,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[] = {{ 0x9F,0x7F,0x83,0x85,0x91,0x00,0x02,0x00 }} /* ; 07 (1024x) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A+CR09(5->7) */ {{ 0x97,0x1F,0x60,0x87,0x5D,0x83,0x10 }},/* ; 00 (x350) */ {{ 0xB4,0x1F,0x92,0x89,0x8F,0xB5,0x30 }},/* ; 01 (x400) */ @@ -2661,7 +2676,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[] = {{ 0x1E,0xF5,0x00,0x83,0xFF,0x1F,0x90 }} /* ; 04 (x768) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x63,0x27,0x87,0x3B,0x8C,0x00,0x01,0x00 }},/* ; 00 (320x) */ {{ 0x63,0x27,0x87,0x3B,0x8C,0x00,0x01,0x00 }},/* ; 01 (360x) */ @@ -2673,7 +2688,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[] = {{ 0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* ; 07 (1024x) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */ {{ 0x24,0xBB,0x31,0x87,0x5D,0x25,0x30 }},/* ; 00 (x350) */ {{ 0x24,0xBB,0x4A,0x80,0x8F,0x25,0x30 }},/* ; 01 (x400) */ @@ -2682,7 +2697,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[] = {{ 0x24,0xF5,0x02,0x88,0xFF,0x25,0x90 }} /* ; 04 (x768) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x56,0x27,0x9A,0x30,0x1E,0x00,0x05,0x00 }},/* ; 00 (320x) */ {{ 0x56,0x27,0x9A,0x30,0x1E,0x00,0x05,0x00 }},/* ; 01 (360x) */ @@ -2695,7 +2710,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[] = {{ 0xCE,0x9F,0x92,0xA5,0x17,0x00,0x07,0x00 }} /* ; 08 (1280x) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */ {{ 0x86,0xD1,0xBC,0x80,0xBB,0xE5,0x00 }},/* ; 00 (x350) */ {{ 0xB8,0x1F,0x90,0x84,0x8F,0xB9,0x30 }},/* ; 01 (x400) */ @@ -2705,7 +2720,7 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[] = {{ 0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9 }} /* ; 05 (x1024) */ }; -struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[] = +static struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[] = { /* CR00,CR02,CR03,CR04,CR05,SR0B,SR0C,SR0E */ {{ 0x7E,0x3B,0x9A,0x44,0x12,0x00,0x01,0x00 }},/* ; 00 (320x) */ @@ -2719,7 +2734,7 @@ struct XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[] = {{ 0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* ; 08 (1280x) */ }; -struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[] = +static struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[] = { /* CR06,CR07,CR10,CR11,CR15,CR16,SR0A */ {{ 0x28,0xD2,0xAF,0x83,0xAE,0xD8,0xA1 }},/* ; 00 (x350) */ @@ -2730,7 +2745,8 @@ struct XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[] = {{ 0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9 }} /* ; 05 (x1024) */ }; -struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UNTSC[] = +#if 0 +static struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UNTSC[] = { {{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e, 0xe8,0x84,0x8f,0x57,0x20,0x00,0x01,0x00 }}, @@ -2746,7 +2762,7 @@ struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UNTSC[] = 0x90,0x8c,0x57,0xed,0x20,0x00,0x06,0x01 }} }; -struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1ONTSC[] = +static struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1ONTSC[] = { {{0x64,0x4f,0x88,0x5a,0x9f,0x0b,0x3e, 0xc0,0x84,0x8f,0x0c,0x20,0x00,0x01,0x00 }}, @@ -2762,7 +2778,7 @@ struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1ONTSC[] = 0x7f,0x86,0x57,0xbb,0x00,0x00,0x06,0x01 }} }; -struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UPAL[] = +static struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UPAL[] = { {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e, 0xf8,0x83,0x8f,0x70,0x20,0x00,0x05,0x00 }}, @@ -2778,7 +2794,7 @@ struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UPAL[] = 0xc8,0x8c,0x57,0xe9,0x20,0x00,0x05,0x01 }} }; -struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1OPAL[] = +static struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1OPAL[] = { {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e, 0xf0,0x83,0x8f,0x70,0x20,0x00,0x05,0x00 }}, @@ -2793,9 +2809,10 @@ struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1OPAL[] = {{0x73,0x63,0x97,0x69,0x8e,0xec,0xf0, 0x90,0x8c,0x57,0xed,0x20,0x00,0x05,0x01 }} }; +#endif /*add for new UNIVGABIOS*/ -struct XGI330_LCDDataTablStruct XGI_LCDDataTable[] = +static struct XGI330_LCDDataTablStruct XGI_LCDDataTable[] = { {Panel1024x768,0x0019,0x0001,0}, /* XGI_ExtLCD1024x768Data */ {Panel1024x768,0x0019,0x0000,1}, /* XGI_StLCD1024x768Data */ @@ -2819,7 +2836,7 @@ struct XGI330_LCDDataTablStruct XGI_LCDDataTable[] = {0xFF,0x0000,0x0000,0} /* End of table */ }; -struct XGI330_LCDDataTablStruct XGI_LCDDesDataTable[] = +static struct XGI330_LCDDataTablStruct XGI_LCDDesDataTable[] = { {Panel1024x768,0x0019,0x0001,0}, /* XGI_ExtLCDDes1024x768Data */ {Panel1024x768,0x0019,0x0000,1}, /* XGI_StLCDDes1024x768Data */ @@ -2844,7 +2861,7 @@ struct XGI330_LCDDataTablStruct XGI_LCDDesDataTable[] = {0xFF,0x0000,0x0000,0} }; -struct XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_H[] = +static struct XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_H[] = { {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDSCRT11024x768_1_H */ {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDSCRT11024x768_2_H */ @@ -2860,7 +2877,7 @@ struct XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_H[] = {0xFF,0x0000,0x0000,0} }; -struct XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_V[] = +static struct XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_V[] = { {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDSCRT11024x768_1_V */ {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDSCRT11024x768_2_V */ @@ -2876,7 +2893,7 @@ struct XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_V[] = {0xFF,0x0000,0x0000,0} }; -struct XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[] = +static struct XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[] = { {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDS1024x768Data_1 */ {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDS1024x768Data_2 */ @@ -2894,7 +2911,7 @@ struct XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[] = {0xFF,0x0000,0x0000,0} }; -struct XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[] = +static struct XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[] = { {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDS1024x768Des_1 */ {Panel1024x768,0x0618,0x0410,1}, /* XGI_LVDS1024x768Des_3 */ @@ -2914,14 +2931,14 @@ struct XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[] = {0xFF,0x0000,0x0000,0} }; -struct XGI330_LCDDataTablStruct XGI_EPLCHLCDRegPtr[] = +static struct XGI330_LCDDataTablStruct XGI_EPLCHLCDRegPtr[] = { {Panel1024x768,0x0000,0x0000,0}, /* XGI_CH7017LV1024x768 */ {Panel1400x1050,0x0000,0x0000,1}, /* XGI_CH7017LV1400x1050 */ {0xFF,0x0000,0x0000,0} }; -struct XGI330_TVDataTablStruct XGI_TVDataTable[] = +static struct XGI330_TVDataTablStruct XGI_TVDataTable[] = { {0x09E1,0x0001,0}, /* XGI_ExtPALData */ {0x09E1,0x0000,1}, /* XGI_ExtNTSCData */ @@ -2939,7 +2956,8 @@ struct XGI330_TVDataTablStruct XGI_TVDataTable[] = {0xffff,0x0000,12} /* END */ }; -unsigned short TVLenList[] = +#if 0 +static unsigned short TVLenList[] = { LVDSCRT1Len_H, LVDSCRT1Len_V, @@ -2950,9 +2968,10 @@ unsigned short TVLenList[] = 0, CHTVRegLen } ; +#endif /* Chrontel 7017 TV CRT1 Timing List */ -struct XGI330_TVDataTablStruct XGI_EPLCHTVCRT1Ptr[] = +static struct XGI330_TVDataTablStruct XGI_EPLCHTVCRT1Ptr[] = { {0x0011,0x0000,0}, /* XGI_CHTVCRT1UNTSC */ {0x0011,0x0010,1}, /* XGI_CHTVCRT1ONTSC */ @@ -2962,7 +2981,7 @@ struct XGI330_TVDataTablStruct XGI_EPLCHTVCRT1Ptr[] = }; /* ;;Chrontel 7017 TV Timing List */ -struct XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[] = +static struct XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[] = { {0x0011,0x0000,0}, /* XGI_CHTVUNTSCData */ {0x0011,0x0010,1}, /* XGI_CHTVONTSCData */ @@ -2972,7 +2991,7 @@ struct XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[] = }; /* ;;Chrontel 7017 TV Reg. List */ -struct XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[] = +static struct XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[] = { {0x0011,0x0000,0}, /* XGI_CHTVRegUNTSC */ {0x0011,0x0010,1}, /* XGI_CHTVRegONTSC */ @@ -2981,7 +3000,7 @@ struct XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[] = {0xFFFF,0x0000,4} }; -unsigned short LCDLenList[] = +static unsigned short LCDLenList[] = { LVDSCRT1Len_H, LVDSCRT1Len_V, @@ -2995,7 +3014,8 @@ unsigned short LCDLenList[] = 0 } ; -struct XGI330_LCDCapStruct XGI660_LCDDLCapList[] = /* 660, Dual link */ +#if 0 +static struct XGI330_LCDCapStruct XGI660_LCDDLCapList[] = /* 660, Dual link */ { /* LCDCap1024x768 */ {Panel1024x768, DefaultLCDCap, 0, 0x014, 0x88, 0x06, VCLK65, @@ -3026,8 +3046,9 @@ struct XGI330_LCDCapStruct XGI660_LCDDLCapList[] = /* 660, Dual link */ 0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00, 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10} }; +#endif -struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = /* Dual link only */ +static struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = /* Dual link only */ { /* LCDCap1024x768 */ {Panel1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65, @@ -3059,7 +3080,8 @@ struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = /* Dual link only */ 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10} }; -struct XGI330_LCDCapStruct XGI660_LCDCapList[] = +#if 0 +static struct XGI330_LCDCapStruct XGI660_LCDCapList[] = { /* LCDCap1024x768 */ {Panel1024x768, DefaultLCDCap, 0, 0x014, 0x88, 0x06, VCLK65, @@ -3090,8 +3112,9 @@ struct XGI330_LCDCapStruct XGI660_LCDCapList[] = 0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00, 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10} }; +#endif -struct XGI330_LCDCapStruct XGI_LCDCapList[] = +static struct XGI330_LCDCapStruct XGI_LCDCapList[] = { /* LCDCap1024x768 */ {Panel1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65, @@ -3152,7 +3175,7 @@ struct XGI21_LVDSCapStruct XGI21_LCDCapList[] = }; -struct XGI_Ext2Struct XGI330_RefIndex[] = +static struct XGI_Ext2Struct XGI330_RefIndex[] = { {Support32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175, 0x00,0x10,0x59, 320, 200},/* 00 */ {Support32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175, 0x00,0x10,0x00, 320, 400},/* 01 */ @@ -3230,8 +3253,8 @@ struct XGI_Ext2Struct XGI330_RefIndex[] = }; - -struct XGI330_VCLKDataStruct XGI330_VCLKData[] = +#if 0 +static struct XGI330_VCLKDataStruct XGI330_VCLKData[] = { { 0x1b,0xe1, 25}, /* 0x0 */ { 0x4e,0xe4, 28}, /* 0x1 */ @@ -3315,7 +3338,7 @@ struct XGI330_VCLKDataStruct XGI330_VCLKData[] = { 0x3b,0x61,108} /* 0x4f */ }; -struct XGI_VBVCLKDataStruct XGI330_VBVCLKData[] = +static struct XGI_VBVCLKDataStruct XGI330_VBVCLKData[] = { { 0x1b,0xe1, 25}, /* 0x0 */ { 0x4e,0xe4, 28}, /* 0x1 */ @@ -3392,12 +3415,14 @@ struct XGI_VBVCLKDataStruct XGI330_VBVCLKData[] = { 0x5e,0x64,68}, /* 0x48 chiawen for fuj1280x768*/ { 0x70,0x44,108}, /* 0x49 chiawen for 1400x1050*/ }; +#endif -unsigned char XGI330_ScreenOffset[] = { 0x14, 0x19, 0x20, 0x28, 0x32, 0x40, +static unsigned char XGI330_ScreenOffset[] = { + 0x14, 0x19, 0x20, 0x28, 0x32, 0x40, 0x50, 0x64, 0x78, 0x80, 0x2d, 0x35, 0x57, 0x48}; -struct XGI_StResInfoStruct XGI330_StResInfo[] = +static struct XGI_StResInfoStruct XGI330_StResInfo[] = { { 640,400}, { 640,350}, @@ -3406,7 +3431,7 @@ struct XGI_StResInfoStruct XGI330_StResInfo[] = { 640,480} }; -struct XGI_ModeResInfoStruct XGI330_ModeResInfo[] = +static struct XGI_ModeResInfoStruct XGI330_ModeResInfo[] = { { 320, 200, 8, 8}, { 320, 240, 8, 8}, @@ -3433,10 +3458,12 @@ struct XGI_ModeResInfoStruct XGI330_ModeResInfo[] = { 1152, 864, 8,16} }; -unsigned char XGI330_OutputSelect = 0x40; -unsigned char XGI330_SoftSetting = 0x30; -unsigned char XGI330_SR07 = 0x18; -unsigned char XGI330New_SR15[8][8] = { +static unsigned char XGI330_OutputSelect = 0x40; +static unsigned char XGI330_SoftSetting = 0x30; +static unsigned char XGI330_SR07 = 0x18; + +#if 0 +static unsigned char XGI330New_SR15[8][8] = { {0x0,0x4,0x60,0x60}, {0xf,0xf,0xf,0xf}, {0xba,0xba,0xba,0xba}, @@ -3447,71 +3474,78 @@ unsigned char XGI330New_SR15[8][8] = { {0x0,0xa5,0xfb,0xf6} }; -unsigned char XGI330New_CR40[5][8] = { +static unsigned char XGI330New_CR40[5][8] = { {0x77,0x77,0x44,0x44}, {0x77,0x77,0x44,0x44}, {0x0,0x0,0x0,0x0}, {0x5b,0x5b,0xab,0xab}, {0x0,0x0,0xf0,0xf8} }; - -unsigned char XGI330_CR49[] = {0xaa, 0x88}; -unsigned char XGI330_SR1F = 0x0; -unsigned char XGI330_SR21 = 0xa3; -unsigned char XGI330_650_SR21 = 0xa7; -unsigned char XGI330_SR22 = 0xfb; -unsigned char XGI330_SR23 = 0xf6; -unsigned char XGI330_SR24 = 0xd; - -unsigned char XGI660_SR21 = 0xa3;/* 2003.0312 */ -unsigned char XGI660_SR22 = 0xf3;/* 2003.0312 */ - -unsigned char XGI330_LVDS_SR32 = 0x00; /* ynlai for 650 LVDS */ -unsigned char XGI330_LVDS_SR33 = 0x00; /* chiawen for 650 LVDS */ -unsigned char XGI330_650_SR31 = 0x40; -unsigned char XGI330_650_SR33 = 0x04; -unsigned char XGI330_CRT2Data_1_2 = 0x0; -unsigned char XGI330_CRT2Data_4_D = 0x0; -unsigned char XGI330_CRT2Data_4_E = 0x0; -unsigned char XGI330_CRT2Data_4_10 = 0x80; -unsigned short XGI330_RGBSenseData = 0xd1; -unsigned short XGI330_VideoSenseData = 0xb9; -unsigned short XGI330_YCSenseData = 0xb3; -unsigned short XGI330_RGBSenseData2 = 0x0190; /*301b*/ -unsigned short XGI330_VideoSenseData2 = 0x0110; -unsigned short XGI330_YCSenseData2 = 0x016B; -unsigned char XGI330_NTSCPhase[] = {0x21, 0xed, 0x8a, 0x8}; -unsigned char XGI330_PALPhase[] = {0x2a, 0x5, 0xd3, 0x0}; -unsigned char XGI330_NTSCPhase2[] = {0x21, 0xF0, 0x7B, 0xD6};/*301b*/ -unsigned char XGI330_PALPhase2[] = {0x2a, 0x09, 0x86, 0xe9}; -unsigned char XGI330_PALMPhase[] = {0x21, 0xE4, 0x2E, 0x9B}; /*palmn*/ -unsigned char XGI330_PALNPhase[] = {0x21, 0xF4, 0x3E, 0xBA}; -unsigned char XG40_I2CDefinition = 0x00 ; -unsigned char XG20_CR97 = 0x10 ; - -unsigned char XG21_DVOSetting = 0x00 ; -unsigned char XG21_CR2E = 0x00 ; -unsigned char XG21_CR2F = 0x00 ; -unsigned char XG21_CR46 = 0x00 ; -unsigned char XG21_CR47 = 0x00 ; - -unsigned char XG27_CR97 = 0xC1 ; -unsigned char XG27_SR36 = 0x30 ; -unsigned char XG27_CR8F = 0x0C ; -unsigned char XG27_CRD0[] = {0, 0, 0, 0, 0, 0, 0, 0x82, 0x00, 0x66, 0x01, 0x00}; -unsigned char XG27_CRDE[] = {0, 0}; -unsigned char XG27_SR40 = 0x04 ; -unsigned char XG27_SR41 = 0x00 ; - -unsigned char XGI330_CHTVVCLKUNTSC[] = {0x00}; - -unsigned char XGI330_CHTVVCLKONTSC[] = {0x00}; - -unsigned char XGI330_CHTVVCLKUPAL[] = {0x00}; - -unsigned char XGI330_CHTVVCLKOPAL[] = {0x00}; - -unsigned char XGI7007_CHTVVCLKUNTSC[] = {CH7007TVVCLK30_2, +#endif + +static unsigned char XGI330_CR49[] = {0xaa, 0x88}; +static unsigned char XGI330_SR1F = 0x0; +static unsigned char XGI330_SR21 = 0xa3; +#if 0 +static unsigned char XGI330_650_SR21 = 0xa7; +#endif +static unsigned char XGI330_SR22 = 0xfb; +static unsigned char XGI330_SR23 = 0xf6; +static unsigned char XGI330_SR24 = 0xd; + +#if 0 +static unsigned char XGI660_SR21 = 0xa3;/* 2003.0312 */ +static unsigned char XGI660_SR22 = 0xf3;/* 2003.0312 */ + +static unsigned char XGI330_LVDS_SR32 = 0x00; /* ynlai for 650 LVDS */ +static unsigned char XGI330_LVDS_SR33 = 0x00; /* chiawen for 650 LVDS */ +static unsigned char XGI330_650_SR31 = 0x40; +static unsigned char XGI330_650_SR33 = 0x04; +#endif +static unsigned char XGI330_CRT2Data_1_2 = 0x0; +static unsigned char XGI330_CRT2Data_4_D = 0x0; +static unsigned char XGI330_CRT2Data_4_E = 0x0; +static unsigned char XGI330_CRT2Data_4_10 = 0x80; +static unsigned short XGI330_RGBSenseData = 0xd1; +static unsigned short XGI330_VideoSenseData = 0xb9; +static unsigned short XGI330_YCSenseData = 0xb3; +static unsigned short XGI330_RGBSenseData2 = 0x0190; /*301b*/ +static unsigned short XGI330_VideoSenseData2 = 0x0110; +static unsigned short XGI330_YCSenseData2 = 0x016B; +#if 0 +static unsigned char XGI330_NTSCPhase[] = {0x21, 0xed, 0x8a, 0x8}; +static unsigned char XGI330_PALPhase[] = {0x2a, 0x5, 0xd3, 0x0}; +static unsigned char XGI330_NTSCPhase2[] = {0x21, 0xF0, 0x7B, 0xD6};/*301b*/ +static unsigned char XGI330_PALPhase2[] = {0x2a, 0x09, 0x86, 0xe9}; +static unsigned char XGI330_PALMPhase[] = {0x21, 0xE4, 0x2E, 0x9B}; /*palmn*/ +static unsigned char XGI330_PALNPhase[] = {0x21, 0xF4, 0x3E, 0xBA}; +#endif +static unsigned char XG40_I2CDefinition = 0x00 ; +static unsigned char XG20_CR97 = 0x10 ; + +static unsigned char XG21_DVOSetting = 0x00 ; +static unsigned char XG21_CR2E = 0x00 ; +static unsigned char XG21_CR2F = 0x00 ; +static unsigned char XG21_CR46 = 0x00 ; +static unsigned char XG21_CR47 = 0x00 ; + +static unsigned char XG27_CR97 = 0xC1 ; +static unsigned char XG27_SR36 = 0x30 ; +static unsigned char XG27_CR8F = 0x0C ; +static unsigned char XG27_CRD0[] = {0, 0, 0, 0, 0, 0, 0, 0x82, 0x00, 0x66, 0x01, 0x00}; +static unsigned char XG27_CRDE[] = {0, 0}; +static unsigned char XG27_SR40 = 0x04 ; +static unsigned char XG27_SR41 = 0x00 ; + +static unsigned char XGI330_CHTVVCLKUNTSC[] = {0x00}; + +static unsigned char XGI330_CHTVVCLKONTSC[] = {0x00}; + +static unsigned char XGI330_CHTVVCLKUPAL[] = {0x00}; + +static unsigned char XGI330_CHTVVCLKOPAL[] = {0x00}; + +static unsigned char XGI7007_CHTVVCLKUNTSC[] = {CH7007TVVCLK30_2, CH7007TVVCLK30_2, CH7007TVVCLK30_2, CH7007TVVCLK30_2, @@ -3519,7 +3553,7 @@ unsigned char XGI7007_CHTVVCLKUNTSC[] = {CH7007TVVCLK30_2, CH7007TVVCLK47_8 }; -unsigned char XGI7007_CHTVVCLKONTSC[] = {CH7007TVVCLK26_4, +static unsigned char XGI7007_CHTVVCLKONTSC[] = {CH7007TVVCLK26_4, CH7007TVVCLK26_4, CH7007TVVCLK26_4, CH7007TVVCLK26_4, @@ -3527,7 +3561,7 @@ unsigned char XGI7007_CHTVVCLKONTSC[] = {CH7007TVVCLK26_4, CH7007TVVCLK43_6 }; -unsigned char XGI7007_CHTVVCLKUPAL[] = {CH7007TVVCLK31_5, +static unsigned char XGI7007_CHTVVCLKUPAL[] = {CH7007TVVCLK31_5, CH7007TVVCLK31_5, CH7007TVVCLK31_5, CH7007TVVCLK31_5, @@ -3535,7 +3569,7 @@ unsigned char XGI7007_CHTVVCLKUPAL[] = {CH7007TVVCLK31_5, CH7007TVVCLK39 }; -unsigned char XGI7007_CHTVVCLKOPAL[] = {CH7007TVVCLK31_5, +static unsigned char XGI7007_CHTVVCLKOPAL[] = {CH7007TVVCLK31_5, CH7007TVVCLK31_5, CH7007TVVCLK31_5, CH7007TVVCLK31_5, @@ -3543,7 +3577,7 @@ unsigned char XGI7007_CHTVVCLKOPAL[] = {CH7007TVVCLK31_5, CH7007TVVCLK36 }; -struct XGI330_VCLKDataStruct XGI_CH7007VCLKData[] = +static struct XGI330_VCLKDataStruct XGI_CH7007VCLKData[] = { { 0x60,0x36,30}, /* 0 30.2 MHZ */ { 0x40,0x4A,28}, /* 1 28.19 MHZ */ @@ -3558,7 +3592,7 @@ struct XGI330_VCLKDataStruct XGI_CH7007VCLKData[] = { 0xFF,0x00,0 } /* End mark */ }; -struct XGI330_VCLKDataStruct XGI_VCLKData[] = +static struct XGI330_VCLKDataStruct XGI_VCLKData[] = { /* SR2B,SR2C,SR2D */ { 0x1B,0xE1,25 },/* 00 (25.175MHz) */ @@ -3759,7 +3793,7 @@ struct XGI330_VCLKDataStruct XGI_VCLKData[] = { 0xFF,0x00,0 }/* End mark */ } ; -struct XGI330_VCLKDataStruct XGI_VBVCLKData[] = +static struct XGI330_VCLKDataStruct XGI_VBVCLKData[] = { { 0x1B,0xE1,25 },/* 00 (25.175MHz) */ @@ -3960,7 +3994,8 @@ struct XGI330_VCLKDataStruct XGI_VBVCLKData[] = { 0xFF,0x00,0 } /* End mark */ }; -unsigned char XGI660_TVDelayList[] = +#if 0 +static unsigned char XGI660_TVDelayList[] = { 0x44, /* ; 0 ExtNTSCDelay */ 0x44, /* ; 1 StNTSCDelay */ @@ -3976,7 +4011,7 @@ unsigned char XGI660_TVDelayList[] = 0x44 /* ; B StYPbPrDealy(750p) */ }; -unsigned char XGI660_TVDelayList2[] = +static unsigned char XGI660_TVDelayList2[] = { 0x44, /* ; 0 ExtNTSCDelay */ 0x44, /* ; 1 StNTSCDelay */ @@ -3991,8 +4026,9 @@ unsigned char XGI660_TVDelayList2[] = 0x44, /* ; A ExtYPbPrDelay(750p) */ 0x44 /* ; B StYPbPrDealy(750p) */ }; +#endif -unsigned char XGI301TVDelayList[] = +static unsigned char XGI301TVDelayList[] = { 0x22, /* ; 0 ExtNTSCDelay */ 0x22, /* ; 1 StNTSCDelay */ @@ -4008,7 +4044,7 @@ unsigned char XGI301TVDelayList[] = 0x22 /* B StYPbPrDealy(750p) */ }; -unsigned char XGI301TVDelayList2[] = +static unsigned char XGI301TVDelayList2[] = { 0x22, /* ; 0 ExtNTSCDelay */ 0x22, /* ; 1 StNTSCDelay */ @@ -4025,7 +4061,7 @@ unsigned char XGI301TVDelayList2[] = }; -unsigned char TVAntiFlickList[] = +static unsigned char TVAntiFlickList[] = {/* NTSCAntiFlicker */ 0x04, /* ; 0 Adaptive */ 0x00, /* ; 1 new anti-flicker ? */ @@ -4038,7 +4074,7 @@ unsigned char TVAntiFlickList[] = }; -unsigned char TVEdgeList[] = +static unsigned char TVEdgeList[] = { 0x00, /* ; 0 NTSC No Edge enhance */ 0x04, /* ; 1 NTSC Adaptive Edge enhance */ @@ -4048,7 +4084,7 @@ unsigned char TVEdgeList[] = 0x00 /* ; 1 HiTV */ }; -unsigned long TVPhaseList[] = +static unsigned long TVPhaseList[] = { 0x08BAED21, /* ; 0 NTSC phase */ 0x00E3052A, /* ; 1 PAL phase */ 0x9B2EE421, /* ; 2 PAL-M phase */ @@ -4065,7 +4101,7 @@ unsigned long TVPhaseList[] = 0xE00A831E /* ; D PAL-M 1024x768 */ }; -unsigned char NTSCYFilter1[] = +static unsigned char NTSCYFilter1[] = { 0x00,0xF4,0x10,0x38 ,/* 0 : 320x text mode */ 0x00,0xF4,0x10,0x38 ,/* 1 : 360x text mode */ @@ -4076,7 +4112,7 @@ unsigned char NTSCYFilter1[] = 0xEB,0x15,0x25,0xF6 /* 6 : 800x gra. mode */ }; -unsigned char PALYFilter1[] = +static unsigned char PALYFilter1[] = { 0x00,0xF4,0x10,0x38, /* 0 : 320x text mode */ 0x00,0xF4,0x10,0x38 ,/* 1 : 360x text mode */ @@ -4087,7 +4123,7 @@ unsigned char PALYFilter1[] = 0xFC,0xFB,0x14,0x2A /* 6 : 800x gra. mode */ }; -unsigned char PALMYFilter1[] = +static unsigned char PALMYFilter1[] = { 0x00,0xF4,0x10,0x38, /* 0 : 320x text mode */ 0x00,0xF4,0x10,0x38, /* 1 : 360x text mode */ @@ -4099,7 +4135,7 @@ unsigned char PALMYFilter1[] = 0xFF,0xFF,0xFF,0xFF /* End of Table */ }; -unsigned char PALNYFilter1[] = +static unsigned char PALNYFilter1[] = { 0x00,0xF4,0x10,0x38, /* 0 : 320x text mode */ 0x00,0xF4,0x10,0x38, /* 1 : 360x text mode */ @@ -4111,7 +4147,7 @@ unsigned char PALNYFilter1[] = 0xFF,0xFF,0xFF,0xFF /* End of Table */ }; -unsigned char NTSCYFilter2[] = +static unsigned char NTSCYFilter2[] = { 0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 0 : 320x text mode */ 0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 1 : 360x text mode */ @@ -4123,7 +4159,7 @@ unsigned char NTSCYFilter2[] = 0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28 /* 7 : 1024xgra. mode */ }; -unsigned char PALYFilter2[] = +static unsigned char PALYFilter2[] = { 0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 0 : 320x text mode */ 0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 1 : 360x text mode */ @@ -4135,7 +4171,7 @@ unsigned char PALYFilter2[] = 0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28 /* 7 : 1024xgra. mode */ }; -unsigned char PALMYFilter2[] = +static unsigned char PALMYFilter2[] = { 0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 0 : 320x text mode */ 0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 1 : 360x text mode */ @@ -4147,7 +4183,7 @@ unsigned char PALMYFilter2[] = 0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28 /* 7 : 1024xgra. mode */ }; -unsigned char PALNYFilter2[] = +static unsigned char PALNYFilter2[] = { 0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46, /* 0 : 320x text mode */ 0x01,0x02,0xFE,0xF7,0x03,0x27,0x3C, /* 1 : 360x text mode */ @@ -4159,14 +4195,14 @@ unsigned char PALNYFilter2[] = 0xFF,0xFF,0xFC,0x00,0x0F,0x22,0x28 /* 7 : 1024xgra. mode */ }; -unsigned char XGI_NTSC1024AdjTime[] = +static 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 }; -struct XGI301C_Tap4TimingStruct HiTVTap4Timing[] = +static struct XGI301C_Tap4TimingStruct HiTVTap4Timing[] = { {0,{ 0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */ @@ -4181,7 +4217,7 @@ struct XGI301C_Tap4TimingStruct HiTVTap4Timing[] = } }; -struct XGI301C_Tap4TimingStruct EnlargeTap4Timing[] = +static struct XGI301C_Tap4TimingStruct EnlargeTap4Timing[] = { {0,{ 0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */ @@ -4196,7 +4232,7 @@ struct XGI301C_Tap4TimingStruct EnlargeTap4Timing[] = } }; -struct XGI301C_Tap4TimingStruct NoScaleTap4Timing[] = +static struct XGI301C_Tap4TimingStruct NoScaleTap4Timing[] = { {0,{ 0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */ @@ -4211,7 +4247,7 @@ struct XGI301C_Tap4TimingStruct NoScaleTap4Timing[] = } }; -struct XGI301C_Tap4TimingStruct PALTap4Timing[] = +static struct XGI301C_Tap4TimingStruct PALTap4Timing[] = { {600, { 0x05,0x19,0x05,0x7D,0x03,0x19,0x06,0x7E, /* ; C0-C7 */ @@ -4249,7 +4285,7 @@ struct XGI301C_Tap4TimingStruct PALTap4Timing[] = } }; -struct XGI301C_Tap4TimingStruct NTSCTap4Timing[] = +static struct XGI301C_Tap4TimingStruct NTSCTap4Timing[] = { {480, { 0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */ @@ -4287,7 +4323,7 @@ struct XGI301C_Tap4TimingStruct NTSCTap4Timing[] = } }; -struct XGI301C_Tap4TimingStruct YPbPr525pTap4Timing[] = +static struct XGI301C_Tap4TimingStruct YPbPr525pTap4Timing[] = { {480, { 0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */ @@ -4325,7 +4361,7 @@ struct XGI301C_Tap4TimingStruct YPbPr525pTap4Timing[] = } }; -struct XGI301C_Tap4TimingStruct YPbPr525iTap4Timing[] = +static struct XGI301C_Tap4TimingStruct YPbPr525iTap4Timing[] = { {480, { 0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */ @@ -4363,7 +4399,7 @@ struct XGI301C_Tap4TimingStruct YPbPr525iTap4Timing[] = } }; -struct XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[] = +static struct XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[] = { {0xFFFF, { 0x05,0x19,0x05,0x7D,0x03,0x19,0x06,0x7E, /* ; C0-C7 */ diff --git a/drivers/staging/xgifb/vb_util.c b/drivers/staging/xgifb/vb_util.c index 2c40368..ae27f0c 100644 --- a/drivers/staging/xgifb/vb_util.c +++ b/drivers/staging/xgifb/vb_util.c @@ -170,7 +170,7 @@ void XGINew_SetRegOR( unsigned long Port , unsigned short Index , unsigned short XGINew_SetReg1( Port , Index , temp ) ; } - +#if 0 /* --------------------------------------------------------------------- */ /* Function : NewDelaySecond */ /* Input : */ @@ -190,7 +190,6 @@ void NewDelaySeconds( int seconds ) } } - /* --------------------------------------------------------------------- */ /* Function : Newdebugcode */ /* Input : */ @@ -203,6 +202,4 @@ void Newdebugcode(unsigned char code) /* OutPortByte ( 0x300 , code ) ; */ /* NewDelaySeconds( 0x3 ) ; */ } - - - +#endif