From: Bill Pemberton Date: Thu, 17 Jun 2010 17:10:51 +0000 (-0400) Subject: Staging: xgifb: Remove typedefs in vb_struct.h X-Git-Tag: v2.6.36-rc1~520^2~1^2~367 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80adad85ea26ace7c39c3aba9c23527f9e9e14da;p=profile%2Fivi%2Fkernel-x86-ivi.git Staging: xgifb: Remove typedefs in vb_struct.h This removes all the remaining typedefs in vb_struct.h Signed-off-by: Bill Pemberton Cc: Arnaud Patard Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index b628582..fd1152e 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -376,7 +376,7 @@ unsigned char XGIfb_detectedlcda = 0xff; struct xgi_hw_device_info XGIhw_ext; /* TW: XGI private structure */ -VB_DEVICE_INFO XGI_Pr; +struct vb_device_info XGI_Pr; /* card parameters */ static unsigned long XGIfb_mmio_size = 0; @@ -820,7 +820,7 @@ extern int XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_d */ extern unsigned char XGI_SearchModeID(unsigned short ModeNo, unsigned short *ModeIdIndex, - PVB_DEVICE_INFO); + struct vb_device_info *); static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info); @@ -887,31 +887,31 @@ unsigned char XGIfb_query_VGA_config_space(struct xgi_hw_device_info *pXGIhw_ext /* Routines from init.c/init301.c */ -extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO pVBInfo); +extern void InitTo330Pointer(unsigned char, struct vb_device_info *pVBInfo); extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension); extern unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo); //extern void XGI_SetEnableDstn(VB_DEVICE_INFO *XGI_Pr); -extern void XGI_LongWait(VB_DEVICE_INFO *XGI_Pr); +extern void XGI_LongWait(struct vb_device_info *XGI_Pr); extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); /* TW: Chrontel TV functions */ -extern unsigned short XGI_GetCH700x(VB_DEVICE_INFO *XGI_Pr, +extern unsigned short XGI_GetCH700x(struct vb_device_info *XGI_Pr, unsigned short tempbx); -extern void XGI_SetCH700x(VB_DEVICE_INFO *XGI_Pr, unsigned short tempbx); -extern unsigned short XGI_GetCH701x(VB_DEVICE_INFO *XGI_Pr, +extern void XGI_SetCH700x(struct vb_device_info *XGI_Pr, unsigned short tempbx); +extern unsigned short XGI_GetCH701x(struct vb_device_info *XGI_Pr, unsigned short tempbx); -extern void XGI_SetCH701x(VB_DEVICE_INFO *XGI_Pr, unsigned short tempbx); -extern void XGI_SetCH70xxANDOR(VB_DEVICE_INFO *XGI_Pr, +extern void XGI_SetCH701x(struct vb_device_info *XGI_Pr, unsigned short tempbx); +extern void XGI_SetCH70xxANDOR(struct vb_device_info *XGI_Pr, unsigned short tempax, unsigned short tempbh); -extern void XGI_DDC2Delay(VB_DEVICE_INFO *XGI_Pr, unsigned short delaytime); +extern void XGI_DDC2Delay(struct vb_device_info *XGI_Pr, unsigned short delaytime); /* TW: Sensing routines */ void XGI_Sense30x(void); int XGIDoSense(int tempbl, int tempbh, int tempcl, int tempch); -extern XGI21_LVDSCapStruct XGI21_LCDCapList[13]; +extern struct XGI21_LVDSCapStruct XGI21_LCDCapList[13]; #endif diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index b3454a9..67d3874 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -162,7 +162,7 @@ struct video_info xgi_video_info; /* --------------- Hardware Access Routines -------------------------- */ int -XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, +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; @@ -197,7 +197,7 @@ XGIfb_mode_rate_to_dclock(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwD } int -XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDeviceExtension, +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 +377,7 @@ XGIfb_mode_rate_to_ddata(VB_DEVICE_INFO *XGI_Pr, struct xgi_hw_device_info *HwDe -void XGIRegInit(VB_DEVICE_INFO *XGI_Pr, unsigned long BaseAddr) +void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr) { XGI_Pr->RelIO = BaseAddr; XGI_Pr->P3c4 = BaseAddr + 0x14; @@ -610,7 +610,8 @@ int XGIfb_GetXG21LVDSData(void) i += 25; j--; k++; - } while ( (j>0) && ( k < (sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct)) ) ); + } while ((j > 0) && + (k < (sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct)))); return 1; } return 0; @@ -3132,7 +3133,7 @@ int __devinit xgifb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) xgi_video_info.disp_state = DISPTYPE_LCD; if (!XGIfb_GetXG21LVDSData()) { int m; - for (m=0; m < sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct); m++) { + for (m = 0; m < sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct); m++) { if ((XGI21_LCDCapList[m].LVDSHDE == XGIbios_mode[xgifb_mode_idx].xres) && (XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_mode_idx].yres)) { XGINew_SetReg1( XGI_Pr.P3d4 , 0x36, m) ; diff --git a/drivers/staging/xgifb/vb_ext.c b/drivers/staging/xgifb/vb_ext.c index 712af83..1ecf9e3 100644 --- a/drivers/staging/xgifb/vb_ext.c +++ b/drivers/staging/xgifb/vb_ext.c @@ -14,27 +14,27 @@ extern unsigned char XGI330_OutputSelect; extern unsigned short XGI330_RGBSenseData2; extern unsigned short XGI330_YCSenseData2; extern unsigned short XGI330_VideoSenseData2; -void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo); +void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +unsigned char XGINew_GetPanelID(struct vb_device_info *pVBInfo); unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, unsigned long VESA_POWER_STATE); -unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); +unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *, struct vb_device_info *pVBInfo); unsigned char XGINew_Sense(unsigned short tempbx, unsigned short tempcx, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); /************************************************************** Dynamic Sense *************************************************************/ void XGI_WaitDisplay(void); -unsigned char XGI_Is301C(PVB_DEVICE_INFO); -unsigned char XGI_Is301LV(PVB_DEVICE_INFO); +unsigned char XGI_Is301C(struct vb_device_info *); +unsigned char XGI_Is301LV(struct vb_device_info *); @@ -44,7 +44,7 @@ unsigned char XGI_Is301LV(PVB_DEVICE_INFO); /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_Is301B(PVB_DEVICE_INFO pVBInfo) +unsigned char XGINew_Is301B(struct vb_device_info *pVBInfo) { unsigned short flag ; @@ -62,7 +62,7 @@ unsigned char XGINew_Is301B(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGI_Is301C(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_Is301C(struct vb_device_info *pVBInfo) { if ( ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) & 0xF0 ) == 0xC0 ) return( 1 ) ; @@ -83,7 +83,7 @@ unsigned char XGI_Is301C(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGI_Is301LV(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_Is301LV(struct vb_device_info *pVBInfo) { if ( XGINew_GetReg1( pVBInfo->Part4Port , 0x01 ) >= 0xD0 ) { @@ -104,7 +104,7 @@ unsigned char XGI_Is301LV(PVB_DEVICE_INFO pVBInfo) /* --------------------------------------------------------------------- */ unsigned char XGINew_Sense(unsigned short tempbx, unsigned short tempcx, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short temp, i, tempch; @@ -140,8 +140,8 @@ void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, { unsigned short ModeNo, ModeIdIndex; unsigned char temp; - VB_DEVICE_INFO VBINF; - PVB_DEVICE_INFO pVBInfo = &VBINF; + struct vb_device_info VBINF; + struct vb_device_info *pVBInfo = &VBINF; pVBInfo->BaseAddr = (unsigned long)pXGIHWDE->pjIOAddress ; pVBInfo->ROMAddr = pXGIHWDE->pjVirtualRomBase ; @@ -359,7 +359,7 @@ void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempax = 0 , tempbx , tempcx , temp , P2reg0 = 0 , SenseModeNo = 0 , OutputSelect = *pVBInfo->pOutputSelect , @@ -559,7 +559,7 @@ void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE /* Description : */ /* --------------------------------------------------------------------- */ unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { /* unsigned short SoftSetting ; */ unsigned short temp ; @@ -582,7 +582,7 @@ unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short temp ; @@ -635,7 +635,7 @@ unsigned char XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo ) +unsigned char XGINew_GetPanelID(struct vb_device_info *pVBInfo) { unsigned short PanelTypeTable[16] = { SyncNN | PanelRGB18Bit | Panel800x600 | _PanelType00, @@ -708,7 +708,7 @@ unsigned char XGINew_GetPanelID(PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short flag ; @@ -735,7 +735,7 @@ unsigned char XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension /* Output : */ /* Description : */ /* ------------------------------------------------------ */ -unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempbx , tempcx , temp , i , tempch; @@ -816,7 +816,7 @@ unsigned char XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension, PVB ; DX: PAnel V. resolution ;----------------------------------------------------------------------------- */ -void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) +void XGI_XG21Fun14Sub70(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments) { unsigned short ModeIdIndex; @@ -859,7 +859,7 @@ void XGI_XG21Fun14Sub70( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) ; ;----------------------------------------------------------------------------- */ -void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) +void XGI_XG21Fun14Sub71(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments) { unsigned short EModeCount; @@ -905,7 +905,7 @@ void XGI_XG21Fun14Sub71( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) ; ;----------------------------------------------------------------------------- */ -void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) +void XGI_XG21Fun14Sub72(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments) { unsigned short ModeIdIndex, resindex; unsigned short ModeNo; @@ -964,7 +964,7 @@ void XGI_XG21Fun14Sub72( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) ; BX[6]: *Value1 D[6] Panel H. Polarity ;----------------------------------------------------------------------------- */ -void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) +void XGI_XG21Fun14Sub73(struct vb_device_info *pVBInfo, PX86_REGS pBiosArguments) { unsigned char Select; @@ -1000,8 +1000,8 @@ void XGI_XG21Fun14Sub73( PVB_DEVICE_INFO pVBInfo , PX86_REGS pBiosArguments ) void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments) { - VB_DEVICE_INFO VBINF; - PVB_DEVICE_INFO pVBInfo = &VBINF; + struct vb_device_info VBINF; + struct vb_device_info *pVBInfo = &VBINF; pVBInfo->IF_DEF_LVDS = 0 ; pVBInfo->IF_DEF_CH7005 = 0 ; diff --git a/drivers/staging/xgifb/vb_ext.h b/drivers/staging/xgifb/vb_ext.h index 2933b16..5cc4d12 100644 --- a/drivers/staging/xgifb/vb_ext.h +++ b/drivers/staging/xgifb/vb_ext.h @@ -24,11 +24,11 @@ typedef union _X86_REGS { extern void XGI_XG21Fun14(struct xgi_hw_device_info *pXGIHWDE, PX86_REGS pBiosArguments); extern void XGISetDPMS(struct xgi_hw_device_info *pXGIHWDE, unsigned long VESA_POWER_STATE); -extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -extern void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; +extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +extern void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; extern void ReadVBIOSTablData(unsigned char ChipType, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); #endif diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 254c368..e02722d 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -72,39 +72,39 @@ unsigned short XGINew_DDRDRAM_TYPE20[12][5] = { { 2, 12, 9, 8, 0x35}, { 2, 12, 8, 4, 0x31} }; -void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *, PVB_DEVICE_INFO); -void XGINew_SetDRAMSize_310(struct xgi_hw_device_info *, PVB_DEVICE_INFO); -void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -void XGINew_SetDRAMModeRegister(PVB_DEVICE_INFO ); +void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *, struct vb_device_info *); +void XGINew_SetDRAMSize_310(struct xgi_hw_device_info *, struct vb_device_info *); +void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +void XGINew_SetDRAMModeRegister(struct vb_device_info *); void XGINew_SetDRAMModeRegister340(struct xgi_hw_device_info *HwDeviceExtension); void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long, PVB_DEVICE_INFO); + unsigned long, struct vb_device_info *); unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension); -int XGINew_DDRSizing340(struct xgi_hw_device_info *, PVB_DEVICE_INFO); -void XGINew_DisableRefresh(struct xgi_hw_device_info *, PVB_DEVICE_INFO) ; -void XGINew_CheckBusWidth_310( PVB_DEVICE_INFO) ; -int XGINew_SDRSizing(PVB_DEVICE_INFO); -int XGINew_DDRSizing( PVB_DEVICE_INFO ); -void XGINew_EnableRefresh(struct xgi_hw_device_info *, PVB_DEVICE_INFO); +int XGINew_DDRSizing340(struct xgi_hw_device_info *, struct vb_device_info *); +void XGINew_DisableRefresh(struct xgi_hw_device_info *, struct vb_device_info *) ; +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 */ -unsigned char ChkLFB(PVB_DEVICE_INFO); +unsigned char ChkLFB(struct vb_device_info *); void XGINew_Delay15us(unsigned long); void SetPowerConsume(struct xgi_hw_device_info *HwDeviceExtension, unsigned long XGI_P3d4Port); -void ReadVBIOSTablData(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo); -void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, PVB_DEVICE_INFO pVBInfo); +void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo); +void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo); void XGINew_SetDRAMModeRegister_XG20(struct xgi_hw_device_info *HwDeviceExtension); void XGINew_SetDRAMModeRegister_XG27(struct xgi_hw_device_info *HwDeviceExtension); -void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; -void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; -void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; -unsigned char GetXG21FPBits(PVB_DEVICE_INFO pVBInfo); -void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) ; -unsigned char GetXG27FPBits(PVB_DEVICE_INFO pVBInfo); +void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; +void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; +void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) ; +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) { @@ -121,8 +121,8 @@ void DelayUS(unsigned long MicroSeconds) unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) { - VB_DEVICE_INFO VBINF; - PVB_DEVICE_INFO pVBInfo = &VBINF; + struct vb_device_info VBINF; + struct vb_device_info *pVBInfo = &VBINF; unsigned char i, temp = 0, temp1 ; // VBIOSVersion[ 5 ] ; volatile unsigned char *pVideoMemory; @@ -547,7 +547,7 @@ return 1; /* Description : */ /* --------------------------------------------------------------------- */ unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned char data, temp; @@ -617,7 +617,7 @@ unsigned char XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtensio /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_Get310DRAMType(PVB_DEVICE_INFO pVBInfo) +unsigned char XGINew_Get310DRAMType(struct vb_device_info *pVBInfo) { unsigned char data ; @@ -653,7 +653,7 @@ void XGINew_Delay15us(unsigned long ulMicrsoSec) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SDR_MRS( PVB_DEVICE_INFO pVBInfo ) +void XGINew_SDR_MRS(struct vb_device_info *pVBInfo) { unsigned short data ; @@ -673,7 +673,7 @@ void XGINew_SDR_MRS( PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR1x_MRS_340(unsigned long P3c4 , PVB_DEVICE_INFO pVBInfo) +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 +711,7 @@ void XGINew_DDR1x_MRS_340(unsigned long P3c4 , PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR2x_MRS_340(unsigned long P3c4 , PVB_DEVICE_INFO pVBInfo) +void XGINew_DDR2x_MRS_340(unsigned long P3c4, struct vb_device_info *pVBInfo) { XGINew_SetReg1( P3c4 , 0x18 , 0x00 ) ; XGINew_SetReg1( P3c4 , 0x19 , 0x20 ) ; @@ -741,7 +741,7 @@ void XGINew_DDR2x_MRS_340(unsigned long P3c4 , PVB_DEVICE_INFO pVBInfo) /* Description : */ /* --------------------------------------------------------------------- */ void XGINew_DDRII_Bootup_XG27(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) + unsigned long P3c4, struct vb_device_info *pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; XGINew_RAMType = ( int )XGINew_GetXG20DRAMType( HwDeviceExtension , pVBInfo ) ; @@ -820,7 +820,7 @@ void XGINew_DDRII_Bootup_XG27(struct xgi_hw_device_info *HwDeviceExtension, /* Description : */ /* --------------------------------------------------------------------- */ void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) + unsigned long P3c4, struct vb_device_info *pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; @@ -873,7 +873,7 @@ void XGINew_DDR2_MRS_XG20(struct xgi_hw_device_info *HwDeviceExtension, /* Description : */ /* --------------------------------------------------------------------- */ void XGINew_DDR2_MRS_XG27(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) + unsigned long P3c4, struct vb_device_info *pVBInfo) { unsigned long P3d4 = P3c4 + 0x10 ; @@ -952,7 +952,7 @@ void XGINew_DDR2_MRS_XG27(struct xgi_hw_device_info *HwDeviceExtension, /* Description : */ /* --------------------------------------------------------------------- */ void XGINew_DDR1x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long Port, PVB_DEVICE_INFO pVBInfo) + unsigned long Port, struct vb_device_info *pVBInfo) { unsigned long P3d4 = Port , P3c4 = Port - 0x10 ; @@ -1013,7 +1013,7 @@ void XGINew_DDR1x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, /* Description : */ /* --------------------------------------------------------------------- */ void XGINew_DDR2x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long Port, PVB_DEVICE_INFO pVBInfo) + unsigned long Port, struct vb_device_info *pVBInfo) { unsigned long P3d4 = Port , P3c4 = Port - 0x10 ; @@ -1065,7 +1065,7 @@ void XGINew_DDR2x_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, /* Description : */ /* --------------------------------------------------------------------- */ void XGINew_DDR2_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long Port, PVB_DEVICE_INFO pVBInfo) + unsigned long Port, struct vb_device_info *pVBInfo) { unsigned long P3d4 = Port , P3c4 = Port - 0x10 ; @@ -1104,7 +1104,7 @@ void XGINew_DDR2_DefaultRegister(struct xgi_hw_device_info *HwDeviceExtension, /* Description : */ /* --------------------------------------------------------------------- */ void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtension, - unsigned long Port, PVB_DEVICE_INFO pVBInfo) + unsigned long Port, struct vb_device_info *pVBInfo) { unsigned char temp, temp1, temp2, temp3 , i , j , k ; @@ -1247,7 +1247,7 @@ void XGINew_SetDRAMDefaultRegister340(struct xgi_hw_device_info *HwDeviceExtensi /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR_MRS(PVB_DEVICE_INFO pVBInfo) +void XGINew_DDR_MRS(struct vb_device_info *pVBInfo) { unsigned short data ; @@ -1315,7 +1315,7 @@ void XGINew_DDR_MRS(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_VerifyMclk(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_VerifyMclk(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned char *pVideoMemory = pVBInfo->FBAddr ; unsigned char i, j ; @@ -1361,7 +1361,7 @@ void XGINew_VerifyMclk(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_ /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short data ; @@ -1390,7 +1390,7 @@ void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension, PVB_DE /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMSize_310(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_SetDRAMSize_310(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short data ; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase , @@ -1457,8 +1457,8 @@ void XGINew_SetDRAMSize_310(struct xgi_hw_device_info *HwDeviceExtension, PVB_DE void XGINew_SetDRAMModeRegister340(struct xgi_hw_device_info *HwDeviceExtension) { unsigned char data ; - VB_DEVICE_INFO VBINF; - PVB_DEVICE_INFO pVBInfo = &VBINF; + struct vb_device_info VBINF; + struct vb_device_info *pVBInfo = &VBINF; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ; pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ; pVBInfo->BaseAddr = (unsigned long)HwDeviceExtension->pjIOAddress ; @@ -1508,7 +1508,7 @@ void XGINew_SetDRAMModeRegister340(struct xgi_hw_device_info *HwDeviceExtension) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetDRAMModeRegister( PVB_DEVICE_INFO pVBInfo) +void XGINew_SetDRAMModeRegister(struct vb_device_info *pVBInfo) { if ( XGINew_Get310DRAMType( pVBInfo ) < 2 ) { @@ -1528,7 +1528,7 @@ void XGINew_SetDRAMModeRegister( PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DisableRefresh(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_DisableRefresh(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short data ; @@ -1546,7 +1546,7 @@ void XGINew_DisableRefresh(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEV /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_EnableRefresh(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_EnableRefresh(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { XGINew_SetReg1( pVBInfo->P3c4 , 0x1B , pVBInfo->SR15[ 3 ][ XGINew_RAMType ] ) ; /* SR1B */ @@ -1563,7 +1563,7 @@ void XGINew_EnableRefresh(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVI /* --------------------------------------------------------------------- */ void XGINew_DisableChannelInterleaving(int index, unsigned short XGINew_DDRDRAM_TYPE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data ; @@ -1599,7 +1599,7 @@ void XGINew_DisableChannelInterleaving(int index, /* --------------------------------------------------------------------- */ void XGINew_SetDRAMSizingType(int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data; @@ -1616,7 +1616,7 @@ void XGINew_SetDRAMSizingType(int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_CheckBusWidth_310( PVB_DEVICE_INFO pVBInfo) +void XGINew_CheckBusWidth_310(struct vb_device_info *pVBInfo) { unsigned short data ; volatile unsigned long *pVideoMemory ; @@ -1754,7 +1754,7 @@ int XGINew_SetRank(int index, unsigned char RankNo, unsigned char XGINew_ChannelAB, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data; int RankSize ; @@ -1795,7 +1795,7 @@ int XGINew_SetDDRChannel(int index, unsigned char ChannelNo, unsigned char XGINew_ChannelAB, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data; int RankSize ; @@ -1833,7 +1833,7 @@ int XGINew_SetDDRChannel(int index, /* --------------------------------------------------------------------- */ int XGINew_CheckColumn(int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { int i ; unsigned long Increment , Position ; @@ -1867,7 +1867,7 @@ int XGINew_CheckColumn(int index, /* --------------------------------------------------------------------- */ int XGINew_CheckBanks(int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { int i ; unsigned long Increment , Position ; @@ -1900,7 +1900,7 @@ int XGINew_CheckBanks(int index, /* --------------------------------------------------------------------- */ int XGINew_CheckRank(int RankNo, int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { int i ; unsigned long Increment , Position ; @@ -1936,7 +1936,7 @@ int XGINew_CheckRank(int RankNo, int index, /* --------------------------------------------------------------------- */ int XGINew_CheckDDRRank(int RankNo, int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned long Increment , Position ; unsigned short data ; @@ -1980,7 +1980,7 @@ int XGINew_CheckDDRRank(int RankNo, int index, /* --------------------------------------------------------------------- */ int XGINew_CheckRanks(int RankNo, int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { int r ; @@ -2008,7 +2008,7 @@ int XGINew_CheckRanks(int RankNo, int index, /* --------------------------------------------------------------------- */ int XGINew_CheckDDRRanks(int RankNo, int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { int r ; @@ -2034,7 +2034,7 @@ int XGINew_CheckDDRRanks(int RankNo, int index, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_SDRSizing(PVB_DEVICE_INFO pVBInfo) +int XGINew_SDRSizing(struct vb_device_info *pVBInfo) { int i ; unsigned char j ; @@ -2067,7 +2067,7 @@ int XGINew_SDRSizing(PVB_DEVICE_INFO pVBInfo) /* --------------------------------------------------------------------- */ unsigned short XGINew_SetDRAMSizeReg(int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data = 0 , memsize = 0; int RankSize ; @@ -2118,7 +2118,7 @@ unsigned short XGINew_SetDRAMSizeReg(int index, /* --------------------------------------------------------------------- */ unsigned short XGINew_SetDRAMSize20Reg(int index, unsigned short DRAMTYPE_TABLE[][5], - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data = 0 , memsize = 0; int RankSize ; @@ -2169,7 +2169,7 @@ unsigned short XGINew_SetDRAMSize20Reg(int index, /* Description : */ /* --------------------------------------------------------------------- */ int XGINew_ReadWriteRest(unsigned short StopAddr, unsigned short StartAddr, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { int i ; unsigned long Position = 0 ; @@ -2205,7 +2205,7 @@ int XGINew_ReadWriteRest(unsigned short StopAddr, unsigned short StartAddr, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGINew_CheckFrequence(PVB_DEVICE_INFO pVBInfo) +unsigned char XGINew_CheckFrequence(struct vb_device_info *pVBInfo) { unsigned char data ; @@ -2228,7 +2228,7 @@ unsigned char XGINew_CheckFrequence(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned char data; @@ -2509,7 +2509,7 @@ void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVIC /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { int i ; unsigned short memsize , addr ; @@ -2564,7 +2564,7 @@ int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -int XGINew_DDRSizing(PVB_DEVICE_INFO pVBInfo) +int XGINew_DDRSizing(struct vb_device_info *pVBInfo) { int i ; unsigned char j ; @@ -2595,7 +2595,7 @@ int XGINew_DDRSizing(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { @@ -2627,7 +2627,7 @@ void XGINew_SetMemoryClock(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEV /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char ChkLFB(PVB_DEVICE_INFO pVBInfo) +unsigned char ChkLFB(struct vb_device_info *pVBInfo) { if (LFBDRAMTrap & XGINew_GetReg1(pVBInfo->P3d4 , 0x78)) return 1; @@ -2673,7 +2673,7 @@ void SetPowerConsume(struct xgi_hw_device_info *HwDeviceExtension, } -void XGINew_InitVBIOSData(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_InitVBIOSData(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { /* unsigned long ROMAddr = (unsigned long)HwDeviceExtension->pjVirtualRomBase; */ @@ -2722,7 +2722,7 @@ void XGINew_InitVBIOSData(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVI /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void ReadVBIOSTablData(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo) +void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo) { volatile unsigned char *pVideoMemory = (unsigned char *)pVBInfo->ROMAddr; unsigned long i ; @@ -2761,7 +2761,8 @@ void ReadVBIOSTablData(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo) i += 25; j--; k++; - } while ( (j>0) && ( k < (sizeof(XGI21_LCDCapList)/sizeof(XGI21_LVDSCapStruct)) ) ); + } while ((j > 0) && + (k < (sizeof(XGI21_LCDCapList)/sizeof(struct XGI21_LVDSCapStruct)))); } else { @@ -2792,7 +2793,7 @@ void ReadVBIOSTablData(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) +void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, struct vb_device_info *pVBInfo) { XGINew_SetReg1( P3c4 , 0x18 , 0x01 ) ; @@ -2830,8 +2831,8 @@ void XGINew_DDR1x_MRS_XG20(unsigned long P3c4, PVB_DEVICE_INFO pVBInfo) /* --------------------------------------------------------------------- */ void XGINew_SetDRAMModeRegister_XG20(struct xgi_hw_device_info *HwDeviceExtension) { - VB_DEVICE_INFO VBINF; - PVB_DEVICE_INFO pVBInfo = &VBINF; + struct vb_device_info VBINF; + struct vb_device_info *pVBInfo = &VBINF; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ; pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ; pVBInfo->BaseAddr = (unsigned long)HwDeviceExtension->pjIOAddress ; @@ -2869,8 +2870,8 @@ void XGINew_SetDRAMModeRegister_XG20(struct xgi_hw_device_info *HwDeviceExtensio void XGINew_SetDRAMModeRegister_XG27(struct xgi_hw_device_info *HwDeviceExtension) { - VB_DEVICE_INFO VBINF; - PVB_DEVICE_INFO pVBInfo = &VBINF; + struct vb_device_info VBINF; + struct vb_device_info *pVBInfo = &VBINF; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ; pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ; pVBInfo->BaseAddr = (unsigned long)HwDeviceExtension->pjIOAddress ; @@ -2913,8 +2914,8 @@ void XGINew_SetDRAMModeRegister_XG27(struct xgi_hw_device_info *HwDeviceExtensio { unsigned char data ; - VB_DEVICE_INFO VBINF; - PVB_DEVICE_INFO pVBInfo = &VBINF; + struct vb_device_info VBINF; + struct vb_device_info *pVBInfo = &VBINF; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ; pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ; pVBInfo->BaseAddr = HwDeviceExtension->pjIOAddress ; @@ -2956,7 +2957,7 @@ void XGINew_SetDRAMModeRegister_XG27(struct xgi_hw_device_info *HwDeviceExtensio /* Output : */ /* Description : */ /* -------------------------------------------------------- */ -void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempbx = 0, temp, tempcx, CR3CData; @@ -3017,7 +3018,7 @@ void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEV /* Output : */ /* Description : */ /* -------------------------------------------------------- */ -void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short temp , tempcl = 0 , tempch = 0 , CR31Data , CR38Data; @@ -3114,7 +3115,7 @@ void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEV /* Output : */ /* Description : */ /* -------------------------------------------------------- */ -void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned char Temp; volatile unsigned char *pVideoMemory = (unsigned char *)pVBInfo->ROMAddr; @@ -3156,7 +3157,7 @@ void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVIC /* Output : */ /* Description : */ /* -------------------------------------------------------- */ -void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned char Temp, bCR4A; @@ -3180,7 +3181,7 @@ void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVIC } -unsigned char GetXG21FPBits(PVB_DEVICE_INFO pVBInfo) +unsigned char GetXG21FPBits(struct vb_device_info *pVBInfo) { unsigned char CR38, CR4A, temp; @@ -3200,7 +3201,7 @@ unsigned char GetXG21FPBits(PVB_DEVICE_INFO pVBInfo) return temp; } -unsigned char GetXG27FPBits(PVB_DEVICE_INFO pVBInfo) +unsigned char GetXG27FPBits(struct vb_device_info *pVBInfo) { unsigned char CR4A, temp; diff --git a/drivers/staging/xgifb/vb_init.h b/drivers/staging/xgifb/vb_init.h index 8803253..b47352b 100644 --- a/drivers/staging/xgifb/vb_init.h +++ b/drivers/staging/xgifb/vb_init.h @@ -1,7 +1,7 @@ #ifndef _VBINIT_ #define _VBINIT_ extern unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) ; -extern XGI21_LVDSCapStruct XGI21_LCDCapList[13]; +extern struct XGI21_LVDSCapStruct XGI21_LCDCapList[13]; #endif diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 158789c..d90bf06 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -20,169 +20,173 @@ -unsigned char XGI_IsLCDDualLink(PVB_DEVICE_INFO pVBInfo); +unsigned char XGI_IsLCDDualLink(struct vb_device_info *pVBInfo); unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo); -unsigned char XGI_BacklightByDrv(PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); +unsigned char XGI_BacklightByDrv(struct vb_device_info *pVBInfo); -unsigned char XGI_IsLCDON(PVB_DEVICE_INFO pVBInfo); -unsigned char XGI_DisableChISLCD(PVB_DEVICE_INFO pVBInfo); -unsigned char XGI_EnableChISLCD(PVB_DEVICE_INFO pVBInfo); +unsigned char XGI_IsLCDON(struct vb_device_info *pVBInfo); +unsigned char XGI_DisableChISLCD(struct vb_device_info *pVBInfo); +unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo); unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - unsigned short *i, PVB_DEVICE_INFO pVBInfo); + unsigned short *i, struct vb_device_info *pVBInfo); unsigned char XGI_SearchModeID(unsigned short ModeNo, unsigned short *ModeIdIndex, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo); -unsigned char XGI_BridgeIsOn(PVB_DEVICE_INFO pVBInfo); +unsigned char XGI_BridgeIsOn(struct vb_device_info *pVBInfo); unsigned char XGI_GetModePtr(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned short XGI_GetOffset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned short XGI_GetResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned short XGI_GetColorDepth(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo); -unsigned short XGI_GetVGAHT2(PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); +unsigned short XGI_GetVGAHT2(struct vb_device_info *pVBInfo); unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo); -void XGI_VBLongWait(PVB_DEVICE_INFO pVBInfo); -void XGI_SaveCRT2Info(unsigned short ModeNo, PVB_DEVICE_INFO pVBInfo); -void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_GetCRT2ResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_SetGroup5(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_FirePWDEnable(PVB_DEVICE_INFO pVBInfo); -void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_SetPanelDelay(unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); -void XGI_SetPanelPower(unsigned short tempah, unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); -void XGI_EnablePWD( PVB_DEVICE_INFO pVBInfo); -void XGI_DisablePWD( PVB_DEVICE_INFO pVBInfo); -void XGI_AutoThreshold( PVB_DEVICE_INFO pVBInfo); -void XGI_SetTap4Regs( PVB_DEVICE_INFO pVBInfo); - -void XGI_DisplayOn(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); -void XGI_DisplayOff(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetXG21CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetXG21LCD(PVB_DEVICE_INFO pVBInfo, unsigned short RefreshRateTableIndex, unsigned short ModeNo); -void XGI_SetXG27CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetXG27LCD(PVB_DEVICE_INFO pVBInfo, unsigned short RefreshRateTableIndex, unsigned short ModeNo); -void XGI_UpdateXG21CRTC(unsigned short ModeNo, PVB_DEVICE_INFO pVBInfo, unsigned short RefreshRateTableIndex); -void XGI_WaitDisply(PVB_DEVICE_INFO pVBInfo); -void XGI_SenseCRT1(PVB_DEVICE_INFO pVBInfo); -void XGI_SetSeqRegs(unsigned short ModeNo, unsigned short StandTableIndex, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_SetMiscRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetATTRegs(unsigned short ModeNo, unsigned short StandTableIndex, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo ); -void XGI_SetGRCRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_ClearExt1Regs(PVB_DEVICE_INFO pVBInfo); - -void XGI_SetSync(unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo, struct xgi_hw_device_info *HwDeviceExtension); -void XGI_SetCRT1Timing_H(PVB_DEVICE_INFO pVBInfo, struct xgi_hw_device_info *HwDeviceExtension); -void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex, unsigned short ModeNo,PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1FIFO(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); - -void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_WriteDAC(unsigned short dl, unsigned short ah, unsigned short al, unsigned short dh, PVB_DEVICE_INFO pVBInfo); -/*void XGI_ClearBuffer(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, PVB_DEVICE_INFO pVBInfo);*/ -void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_GetLVDSResInfo(unsigned short ModeNo, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_GetVBType(PVB_DEVICE_INFO pVBInfo); -void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT2ECLK(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex,PVB_DEVICE_INFO pVBInfo); -void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO pVBInfo); -void XGI_GetLCDSync(unsigned short *HSyncWidth, unsigned short *VSyncWidth, PVB_DEVICE_INFO pVBInfo); -void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT2VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_OEM310Setting(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetDelayComp(PVB_DEVICE_INFO pVBInfo); -void XGI_SetLCDCap(PVB_DEVICE_INFO pVBInfo); -void XGI_SetLCDCap_A(unsigned short tempcx,PVB_DEVICE_INFO pVBInfo); -void XGI_SetLCDCap_B(unsigned short tempcx,PVB_DEVICE_INFO pVBInfo); -void SetSpectrum(PVB_DEVICE_INFO pVBInfo); -void XGI_SetAntiFlicker(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetEdgeEnhance(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetPhaseIncr(PVB_DEVICE_INFO pVBInfo); -void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); +void XGI_VBLongWait(struct vb_device_info *pVBInfo); +void XGI_SaveCRT2Info(unsigned short ModeNo, struct vb_device_info *pVBInfo); +void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_GetCRT2ResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_SetGroup5(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_FirePWDEnable(struct vb_device_info *pVBInfo); +void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_SetPanelDelay(unsigned short tempbl, struct vb_device_info *pVBInfo); +void XGI_SetPanelPower(unsigned short tempah, unsigned short tempbl, struct vb_device_info *pVBInfo); +void XGI_EnablePWD(struct vb_device_info *pVBInfo); +void XGI_DisablePWD(struct vb_device_info *pVBInfo); +void XGI_AutoThreshold(struct vb_device_info *pVBInfo); +void XGI_SetTap4Regs(struct vb_device_info *pVBInfo); + +void XGI_DisplayOn(struct xgi_hw_device_info *, struct vb_device_info *pVBInfo); +void XGI_DisplayOff(struct xgi_hw_device_info *, struct vb_device_info *pVBInfo); +void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetXG21CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetXG21LCD(struct vb_device_info *pVBInfo, unsigned short RefreshRateTableIndex, unsigned short ModeNo); +void XGI_SetXG27CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetXG27LCD(struct vb_device_info *pVBInfo, unsigned short RefreshRateTableIndex, unsigned short ModeNo); +void XGI_UpdateXG21CRTC(unsigned short ModeNo, struct vb_device_info *pVBInfo, unsigned short RefreshRateTableIndex); +void XGI_WaitDisply(struct vb_device_info *pVBInfo); +void XGI_SenseCRT1(struct vb_device_info *pVBInfo); +void XGI_SetSeqRegs(unsigned short ModeNo, unsigned short StandTableIndex, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetMiscRegs(unsigned short StandTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short StandTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetATTRegs(unsigned short ModeNo, unsigned short StandTableIndex, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetGRCRegs(unsigned short StandTableIndex, struct vb_device_info *pVBInfo); +void XGI_ClearExt1Regs(struct vb_device_info *pVBInfo); + +void XGI_SetSync(unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo, struct xgi_hw_device_info *HwDeviceExtension); +void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo, struct xgi_hw_device_info *HwDeviceExtension); +void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex, unsigned short ModeNo, struct vb_device_info *pVBInfo); +void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetCRT1VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetCRT1FIFO(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); + +void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_WriteDAC(unsigned short dl, unsigned short ah, unsigned short al, unsigned short dh, struct vb_device_info *pVBInfo); +/*void XGI_ClearBuffer(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, struct vb_device_info *pVBInfo);*/ +void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +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); +void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, + unsigned short RefreshRateTableIndex, + struct xgi_hw_device_info *HwDeviceExtension, + struct vb_device_info *pVBInfo); +void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_GetVBType(struct vb_device_info *pVBInfo); +void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetCRT2ECLK(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void InitTo330Pointer(unsigned char, struct vb_device_info *pVBInfo); +void XGI_GetLCDSync(unsigned short *HSyncWidth, unsigned short *VSyncWidth, struct vb_device_info *pVBInfo); +void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); +void XGI_SetCRT2VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_OEM310Setting(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetDelayComp(struct vb_device_info *pVBInfo); +void XGI_SetLCDCap(struct vb_device_info *pVBInfo); +void XGI_SetLCDCap_A(unsigned short tempcx, struct vb_device_info *pVBInfo); +void XGI_SetLCDCap_B(unsigned short tempcx, struct vb_device_info *pVBInfo); +void SetSpectrum(struct vb_device_info *pVBInfo); +void XGI_SetAntiFlicker(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetEdgeEnhance(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetPhaseIncr(struct vb_device_info *pVBInfo); +void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); void XGI_GetTVPtrIndex2(unsigned short *tempbx, unsigned char* tempcl, - unsigned char *tempch, PVB_DEVICE_INFO pVBInfo); -unsigned short XGI_GetTVPtrIndex(PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT2ModeRegs(unsigned short ModeNo, struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); -void XGI_CloseCRTC(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); -void XGI_OpenCRTC(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); -void XGI_GetRAMDAC2DATA(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_UnLockCRT2(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); -void XGI_LockCRT2(struct xgi_hw_device_info *, PVB_DEVICE_INFO pVBInfo); -void XGINew_EnableCRT2(PVB_DEVICE_INFO pVBInfo); -void XGINew_LCD_Wait_Time(unsigned char DelayTime, PVB_DEVICE_INFO pVBInfo); -void XGI_LongWait(PVB_DEVICE_INFO pVBInfo); -void XGI_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo); + unsigned char *tempch, struct vb_device_info *pVBInfo); +unsigned short XGI_GetTVPtrIndex(struct vb_device_info *pVBInfo); +void XGI_SetCRT2ModeRegs(unsigned short ModeNo, struct xgi_hw_device_info *, struct vb_device_info *pVBInfo); +void XGI_CloseCRTC(struct xgi_hw_device_info *, struct vb_device_info *pVBInfo); +void XGI_OpenCRTC(struct xgi_hw_device_info *, struct vb_device_info *pVBInfo); +void XGI_GetRAMDAC2DATA(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo); +void XGI_UnLockCRT2(struct xgi_hw_device_info *, struct vb_device_info *pVBInfo); +void XGI_LockCRT2(struct xgi_hw_device_info *, struct vb_device_info *pVBInfo); +void XGINew_EnableCRT2(struct vb_device_info *pVBInfo); +void XGINew_LCD_Wait_Time(unsigned char DelayTime, struct vb_device_info *pVBInfo); +void XGI_LongWait(struct vb_device_info *pVBInfo); +void XGI_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo); void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *pVBInfo); void XGI_GetVCLKLen(unsigned char tempal, unsigned char *di_0, - unsigned char *di_1, PVB_DEVICE_INFO pVBInfo); -unsigned short XGI_GetLCDCapPtr(PVB_DEVICE_INFO pVBInfo); -unsigned short XGI_GetLCDCapPtr1(PVB_DEVICE_INFO pVBInfo); -XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx, PVB_DEVICE_INFO pVBInfo); -void XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo); -void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo); -unsigned char XGI_XG21GetPSCValue(PVB_DEVICE_INFO pVBInfo); -unsigned char XGI_XG27GetPSCValue(PVB_DEVICE_INFO pVBInfo); -void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); -void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); -void XGI_XG21SetPanelDelay(unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); -unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); -void XGI_SetXG21LVDSPara(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo ); -void XGI_SetXG27LVDSPara(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo ); -unsigned char XGI_SetDefaultVCLK(PVB_DEVICE_INFO pVBInfo); - -extern void ReadVBIOSTablData(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo); + unsigned char *di_1, struct vb_device_info *pVBInfo); +unsigned short XGI_GetLCDCapPtr(struct vb_device_info *pVBInfo); +unsigned short XGI_GetLCDCapPtr1(struct vb_device_info *pVBInfo); +struct XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx, struct vb_device_info *pVBInfo); +void XGI_SetXG21FPBits(struct vb_device_info *pVBInfo); +void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo); +unsigned char XGI_XG21GetPSCValue(struct vb_device_info *pVBInfo); +unsigned char XGI_XG27GetPSCValue(struct vb_device_info *pVBInfo); +void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl, struct vb_device_info *pVBInfo); +void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, struct vb_device_info *pVBInfo); +void XGI_XG21SetPanelDelay(unsigned short tempbl, struct vb_device_info *pVBInfo); +unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetXG21LVDSPara(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +void XGI_SetXG27LVDSPara(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +unsigned char XGI_SetDefaultVCLK(struct vb_device_info *pVBInfo); + +extern void ReadVBIOSTablData(unsigned char ChipType, struct vb_device_info *pVBInfo); /* unsigned short XGINew_flag_clearbuffer; 0: no clear frame buffer 1:clear frame buffer */ @@ -236,35 +240,35 @@ unsigned short XGINew_VGA_DAC[] = { /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void InitTo330Pointer(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo) +void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) { - pVBInfo->SModeIDTable = (XGI_StStruct *) XGI330_SModeIDTable ; - pVBInfo->StandTable = (XGI_StandTableStruct *) XGI330_StandTable ; - pVBInfo->EModeIDTable = (XGI_ExtStruct *) XGI330_EModeIDTable ; - pVBInfo->RefIndex = (XGI_Ext2Struct *) XGI330_RefIndex ; - pVBInfo->XGINEWUB_CRT1Table = (XGI_CRT1TableStruct *) XGI_CRT1Table ; + pVBInfo->SModeIDTable = (struct XGI_StStruct *) XGI330_SModeIDTable ; + pVBInfo->StandTable = (struct XGI_StandTableStruct *) XGI330_StandTable ; + pVBInfo->EModeIDTable = (struct XGI_ExtStruct *) XGI330_EModeIDTable ; + pVBInfo->RefIndex = (struct XGI_Ext2Struct *) XGI330_RefIndex ; + pVBInfo->XGINEWUB_CRT1Table = (struct XGI_CRT1TableStruct *) XGI_CRT1Table ; /* add for new UNIVGABIOS */ - /* XGINew_UBLCDDataTable = (XGI_LCDDataTablStruct *) XGI_LCDDataTable ; */ + /* XGINew_UBLCDDataTable = (struct XGI_LCDDataTablStruct *) XGI_LCDDataTable ; */ /* XGINew_UBTVDataTable = (XGI_TVDataTablStruct *) XGI_TVDataTable ; */ if ( ChipType >= XG40 ) { - pVBInfo->MCLKData = (XGI_MCLKDataStruct *) XGI340New_MCLKData ; - pVBInfo->ECLKData = (XGI_ECLKDataStruct *) XGI340_ECLKData ; + pVBInfo->MCLKData = (struct XGI_MCLKDataStruct *) XGI340New_MCLKData; + pVBInfo->ECLKData = (struct XGI_ECLKDataStruct *) XGI340_ECLKData; } else { - pVBInfo->MCLKData = (XGI_MCLKDataStruct *) XGI330New_MCLKData ; - pVBInfo->ECLKData = (XGI_ECLKDataStruct *) XGI330_ECLKData ; + pVBInfo->MCLKData = (struct XGI_MCLKDataStruct *) XGI330New_MCLKData; + pVBInfo->ECLKData = (struct XGI_ECLKDataStruct *) XGI330_ECLKData; } - pVBInfo->VCLKData = (XGI_VCLKDataStruct *) XGI_VCLKData ; - pVBInfo->VBVCLKData = (XGI_VBVCLKDataStruct *) XGI_VBVCLKData ; + pVBInfo->VCLKData = (struct XGI_VCLKDataStruct *) XGI_VCLKData ; + pVBInfo->VBVCLKData = (struct XGI_VBVCLKDataStruct *) XGI_VBVCLKData ; pVBInfo->ScreenOffset = XGI330_ScreenOffset ; - pVBInfo->StResInfo = (XGI_StResInfoStruct *) XGI330_StResInfo ; - pVBInfo->ModeResInfo = (XGI_ModeResInfoStruct *) XGI330_ModeResInfo ; + pVBInfo->StResInfo = (struct XGI_StResInfoStruct *) XGI330_StResInfo ; + pVBInfo->ModeResInfo = (struct XGI_ModeResInfoStruct *) XGI330_ModeResInfo ; pVBInfo->pOutputSelect = &XGI330_OutputSelect ; pVBInfo->pSoftSetting = &XGI330_SoftSetting ; @@ -328,9 +332,9 @@ void InitTo330Pointer(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo) pVBInfo->Ren750pGroup3 = XGI330_Ren750pGroup3 ; - pVBInfo->TimingH = (XGI_TimingHStruct *) XGI_TimingH ; - pVBInfo->TimingV = (XGI_TimingVStruct *) XGI_TimingV ; - pVBInfo->UpdateCRT1 = (XGI_XG21CRT1Struct *) XGI_UpdateCRT1Table ; + pVBInfo->TimingH = (struct XGI_TimingHStruct *) XGI_TimingH ; + pVBInfo->TimingV = (struct XGI_TimingVStruct *) XGI_TimingV ; + pVBInfo->UpdateCRT1 = (struct XGI_XG21CRT1Struct *) XGI_UpdateCRT1Table ; pVBInfo->CHTVVCLKUNTSC = XGI330_CHTVVCLKUNTSC ; pVBInfo->CHTVVCLKONTSC = XGI330_CHTVVCLKONTSC ; @@ -357,7 +361,7 @@ void InitTo330Pointer(unsigned char ChipType, PVB_DEVICE_INFO pVBInfo) if ( ChipType == XG27 ) { - pVBInfo->MCLKData = (XGI_MCLKDataStruct *) XGI27New_MCLKData ; + pVBInfo->MCLKData = (struct XGI_MCLKDataStruct *) XGI27New_MCLKData; pVBInfo->CR40 = XGI27_cr41 ; pVBInfo->pXGINew_CR97 = &XG27_CR97 ; pVBInfo->pSR36 = &XG27_SR36 ; @@ -396,8 +400,8 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, { unsigned short ModeIdIndex ; /* unsigned char *pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress ; */ - VB_DEVICE_INFO VBINF; - PVB_DEVICE_INFO pVBInfo = &VBINF; + struct vb_device_info VBINF; + struct vb_device_info *pVBInfo = &VBINF; pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase ; pVBInfo->BaseAddr = (unsigned long)HwDeviceExtension->pjIOAddress ; pVBInfo->IF_DEF_LVDS = 0 ; @@ -617,7 +621,7 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, /* --------------------------------------------------------------------- */ void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, - unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) + unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short StandTableIndex , RefreshRateTableIndex , @@ -738,7 +742,7 @@ void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension, /* Description : */ /* --------------------------------------------------------------------- */ unsigned char XGI_GetModePtr(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned char index ; @@ -786,7 +790,7 @@ unsigned char XGI_GetModePtr(unsigned short ModeNo, unsigned short ModeIdIndex, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetSeqRegs(unsigned short ModeNo, unsigned short StandTableIndex, - unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) + unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned char tempah , SRdata ; @@ -833,7 +837,7 @@ void XGI_SetSeqRegs(unsigned short ModeNo, unsigned short StandTableIndex, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetMiscRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo ) +void XGI_SetMiscRegs(unsigned short StandTableIndex, struct vb_device_info *pVBInfo) { unsigned char Miscdata ; @@ -859,7 +863,7 @@ void XGI_SetMiscRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo ) /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension, - unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo) + unsigned short StandTableIndex, struct vb_device_info *pVBInfo) { unsigned char CRTCdata ; unsigned short i ; @@ -895,7 +899,7 @@ void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetATTRegs(unsigned short ModeNo, unsigned short StandTableIndex, - unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) + unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned char ARdata ; unsigned short i, modeflag; @@ -944,7 +948,7 @@ void XGI_SetATTRegs(unsigned short ModeNo, unsigned short StandTableIndex, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetGRCRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo ) +void XGI_SetGRCRegs(unsigned short StandTableIndex, struct vb_device_info *pVBInfo) { unsigned char GRdata ; unsigned short i ; @@ -970,7 +974,7 @@ void XGI_SetGRCRegs(unsigned short StandTableIndex, PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_ClearExt1Regs(PVB_DEVICE_INFO pVBInfo) +void XGI_ClearExt1Regs(struct vb_device_info *pVBInfo) { unsigned short i ; @@ -985,7 +989,7 @@ void XGI_ClearExt1Regs(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGI_SetDefaultVCLK(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_SetDefaultVCLK(struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x31 , ~0x30 , 0x20 ) ; @@ -1010,7 +1014,7 @@ unsigned char XGI_SetDefaultVCLK(PVB_DEVICE_INFO pVBInfo) unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { short LCDRefreshIndex[] = { 0x00 , 0x00 , 0x03 , 0x01 } , LCDARefreshIndex[] = { 0x00 , 0x00 , 0x03 , 0x01 , 0x01 , 0x01 , 0x01 } ; @@ -1148,7 +1152,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, /* --------------------------------------------------------------------- */ unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - unsigned short *i, PVB_DEVICE_INFO pVBInfo) + unsigned short *i, struct vb_device_info *pVBInfo) { unsigned short tempax, tempbx, resinfo, modeflag, infoflag; @@ -1320,7 +1324,7 @@ unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, unsigned short ModeIdInde /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetSync(unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo ) +void XGI_SetSync(unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo) { unsigned short sync , temp ; @@ -1341,7 +1345,7 @@ void XGI_SetSync(unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo ) /* --------------------------------------------------------------------- */ void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo, + struct vb_device_info *pVBInfo, struct xgi_hw_device_info *HwDeviceExtension) { unsigned char index, data; @@ -1378,7 +1382,7 @@ void XGI_SetCRT1CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT1Timing_H(PVB_DEVICE_INFO pVBInfo, struct xgi_hw_device_info *HwDeviceExtension) +void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo, struct xgi_hw_device_info *HwDeviceExtension) { unsigned char data, data1, pushax; unsigned short i, j; @@ -1452,7 +1456,7 @@ void XGI_SetCRT1Timing_H(PVB_DEVICE_INFO pVBInfo, struct xgi_hw_device_info *HwD /* --------------------------------------------------------------------- */ void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex, unsigned short ModeNo, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned char data; unsigned short i, j; @@ -1514,7 +1518,7 @@ void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex, /* --------------------------------------------------------------------- */ void XGI_SetXG21CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned char StandTableIndex, index, Tempax, Tempbx, Tempcx, Tempdx; unsigned short Temp1, Temp2, Temp3; @@ -1655,7 +1659,7 @@ void XGI_SetXG21CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, void XGI_SetXG27CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short StandTableIndex, index, Tempax, Tempbx, Tempcx, Tempdx; @@ -1778,7 +1782,7 @@ void XGI_SetXG27CRTC(unsigned short ModeNo, unsigned short ModeIdIndex, /* Output : FCLK duty cycle, FCLK delay compensation */ /* Description : All values set zero */ /* --------------------------------------------------------------------- */ -void XGI_SetXG21LCD(PVB_DEVICE_INFO pVBInfo, +void XGI_SetXG21LCD(struct vb_device_info *pVBInfo, unsigned short RefreshRateTableIndex, unsigned short ModeNo) { @@ -1830,7 +1834,7 @@ void XGI_SetXG21LCD(PVB_DEVICE_INFO pVBInfo, } } -void XGI_SetXG27LCD(PVB_DEVICE_INFO pVBInfo, +void XGI_SetXG27LCD(struct vb_device_info *pVBInfo, unsigned short RefreshRateTableIndex, unsigned short ModeNo) { @@ -1891,7 +1895,7 @@ void XGI_SetXG27LCD(PVB_DEVICE_INFO pVBInfo, /* Description : Modify CRT1 Hsync/Vsync to fix LCD mode timing */ /* --------------------------------------------------------------------- */ void XGI_UpdateXG21CRTC(unsigned short ModeNo, - PVB_DEVICE_INFO pVBInfo, + struct vb_device_info *pVBInfo, unsigned short RefreshRateTableIndex) { int i , index = -1; @@ -1939,7 +1943,7 @@ void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short resindex, tempax, tempbx, tempcx, temp, modeflag; @@ -2023,7 +2027,7 @@ void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension, /* --------------------------------------------------------------------- */ unsigned short XGI_GetResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short resindex; @@ -2049,7 +2053,7 @@ void XGI_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short temp , ah , @@ -2145,7 +2149,7 @@ void XGI_SetCRT1Offset(unsigned short ModeNo, void XGI_SetCRT1VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned char index, data; unsigned short vclkindex ; @@ -2207,7 +2211,7 @@ void XGI_SetCRT1VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, /* --------------------------------------------------------------------- */ void XGI_SetCRT1FIFO(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data ; @@ -2259,7 +2263,7 @@ void XGI_SetCRT1FIFO(unsigned short ModeNo, void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data , data2 , @@ -2399,7 +2403,7 @@ void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension, void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data , data2 = 0 ; @@ -2463,7 +2467,7 @@ void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -/*void XGI_VesaLowResolution(unsigned short ModeNo , unsigned short ModeIdIndex ,PVB_DEVICE_INFO pVBInfo) +/*void XGI_VesaLowResolution(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short modeflag; @@ -2508,7 +2512,7 @@ void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension, /* --------------------------------------------------------------------- */ void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short data , data2 , time , i , j , k , m , n , o , @@ -2619,7 +2623,7 @@ void XGI_LoadDAC(unsigned short ModeNo, /* --------------------------------------------------------------------- */ void XGI_WriteDAC(unsigned short dl, unsigned short ah, unsigned short al, unsigned short dh, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short temp , bh , bl ; @@ -2658,7 +2662,7 @@ void XGI_WriteDAC(unsigned short dl, unsigned short ah, void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short RefreshRateTableIndex ; /* unsigned short temp ; */ @@ -2683,7 +2687,7 @@ void XGI_SetLCDAGroup(unsigned short ModeNo, /* --------------------------------------------------------------------- */ void XGI_GetLVDSResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short resindex , xres , yres , modeflag ; @@ -2754,17 +2758,17 @@ void XGI_GetLVDSResInfo(unsigned short ModeNo, void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short tempbx ; - XGI330_LVDSDataStruct *LCDPtr = NULL ; - XGI330_CHTVDataStruct *TVPtr = NULL ; + struct XGI330_LVDSDataStruct *LCDPtr = NULL ; + struct XGI330_CHTVDataStruct *TVPtr = NULL ; tempbx = 2 ; if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) { - LCDPtr = ( XGI330_LVDSDataStruct * )XGI_GetLcdPtr( tempbx, ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo) ; + LCDPtr = (struct XGI330_LVDSDataStruct *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); pVBInfo->VGAHT = LCDPtr->VGAHT ; pVBInfo->VGAVT = LCDPtr->VGAVT ; pVBInfo->HT = LCDPtr->LCDHT ; @@ -2774,7 +2778,7 @@ void XGI_GetLVDSData(unsigned short ModeNo, { if ( pVBInfo->VBInfo & SetCRT2ToTV ) { - TVPtr = ( XGI330_CHTVDataStruct * )XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + TVPtr = (struct XGI330_CHTVDataStruct *)XGI_GetTVPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); pVBInfo->VGAHT = TVPtr->VGAHT ; pVBInfo->VGAVT = TVPtr->VGAVT ; pVBInfo->HT = TVPtr->LCDHT ; @@ -2820,15 +2824,15 @@ void XGI_GetLVDSData(unsigned short ModeNo, void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned char index; unsigned short tempbx , i ; - XGI_LVDSCRT1HDataStruct *LCDPtr = NULL ; - XGI_LVDSCRT1VDataStruct *LCDPtr1 =NULL ; - /* XGI330_CHTVDataStruct *TVPtr = NULL ; */ - XGI_CH7007TV_TimingHStruct *CH7007TV_TimingHPtr = NULL; - XGI_CH7007TV_TimingVStruct *CH7007TV_TimingVPtr = NULL; + struct XGI_LVDSCRT1HDataStruct *LCDPtr = NULL; + struct XGI_LVDSCRT1VDataStruct *LCDPtr1 = NULL; + /* struct XGI330_CHTVDataStruct *TVPtr = NULL ; */ + struct XGI_CH7007TV_TimingHStruct *CH7007TV_TimingHPtr = NULL; + struct XGI_CH7007TV_TimingVStruct *CH7007TV_TimingVPtr = NULL; if( ModeNo <= 0x13 ) index = pVBInfo->SModeIDTable[ ModeIdIndex ].St_CRT2CRTC ; @@ -2843,7 +2847,7 @@ void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) { - LCDPtr = ( XGI_LVDSCRT1HDataStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + LCDPtr = (struct XGI_LVDSCRT1HDataStruct *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); for( i = 0 ; i < 8 ; i++ ) pVBInfo->TimingH[ 0 ].data[ i ] = LCDPtr[ 0 ].Reg[ i ] ; @@ -2853,7 +2857,7 @@ void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, { if ( pVBInfo->VBInfo & SetCRT2ToTV ) { - CH7007TV_TimingHPtr = ( XGI_CH7007TV_TimingHStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + CH7007TV_TimingHPtr = (struct XGI_CH7007TV_TimingHStruct *)XGI_GetTVPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); for( i = 0 ; i < 8 ; i++ ) pVBInfo->TimingH[ 0 ].data[ i ] = CH7007TV_TimingHPtr[ 0 ].data[ i ] ; @@ -2863,7 +2867,7 @@ void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, /* if ( pVBInfo->IF_DEF_CH7017 == 1 ) { if ( pVBInfo->VBInfo & SetCRT2ToTV ) - TVPtr = ( XGI330_CHTVDataStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + TVPtr = ( struct XGI330_CHTVDataStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; } */ XGI_SetCRT1Timing_H(pVBInfo,HwDeviceExtension) ; @@ -2878,7 +2882,7 @@ void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) { - LCDPtr1 = ( XGI_LVDSCRT1VDataStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + LCDPtr1 = (struct XGI_LVDSCRT1VDataStruct *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); for( i = 0 ; i < 7 ; i++ ) pVBInfo->TimingV[ 0 ].data[ i ] = LCDPtr1[ 0 ].Reg[ i ] ; } @@ -2887,7 +2891,7 @@ void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, { if ( pVBInfo->VBInfo & SetCRT2ToTV ) { - CH7007TV_TimingVPtr = ( XGI_CH7007TV_TimingVStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + CH7007TV_TimingVPtr = (struct XGI_CH7007TV_TimingVStruct *)XGI_GetTVPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); for( i = 0 ; i < 7 ; i++ ) pVBInfo->TimingV[ 0 ].data[ i ] = CH7007TV_TimingVPtr[ 0 ].data[ i ] ; @@ -2896,7 +2900,7 @@ void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, /* if ( pVBInfo->IF_DEF_CH7017 == 1 ) { if ( pVBInfo->VBInfo & SetCRT2ToTV ) - TVPtr = ( XGI330_CHTVDataStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + TVPtr = ( struct XGI330_CHTVDataStruct *)XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; } */ XGI_SetCRT1Timing_V( ModeIdIndex , ModeNo , pVBInfo) ; @@ -2921,12 +2925,12 @@ void XGI_ModCRT1Regs(unsigned short ModeNo, unsigned short ModeIdIndex, /* --------------------------------------------------------------------- */ void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short tempbx , tempax , tempcx , tempdx , push1 , push2 , modeflag ; unsigned long temp , temp1 , temp2 , temp3 , push3 ; - XGI330_LCDDataDesStruct *LCDPtr = NULL ; - XGI330_LCDDataDesStruct2 *LCDPtr1 = NULL ; + struct XGI330_LCDDataDesStruct *LCDPtr = NULL ; + struct XGI330_LCDDataDesStruct2 *LCDPtr1 = NULL ; if ( ModeNo > 0x13 ) modeflag = pVBInfo->EModeIDTable[ ModeIdIndex ].Ext_ModeFlag ; @@ -2940,16 +2944,16 @@ void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, if ( pVBInfo->IF_DEF_OEMUtil == 1 ) { tempbx = 8 ; - LCDPtr = ( XGI330_LCDDataDesStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + LCDPtr = (struct XGI330_LCDDataDesStruct *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); } if ( ( pVBInfo->IF_DEF_OEMUtil == 0 ) || ( LCDPtr == 0 ) ) { tempbx = 3 ; if ( pVBInfo->LCDInfo & EnableScalingLCD ) - LCDPtr1 = ( XGI330_LCDDataDesStruct2 * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + LCDPtr1 = (struct XGI330_LCDDataDesStruct2 *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); else - LCDPtr = ( XGI330_LCDDataDesStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + LCDPtr = (struct XGI330_LCDDataDesStruct *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); } XGI_GetLCDSync( &tempax , &tempbx ,pVBInfo) ; @@ -3187,7 +3191,7 @@ void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT2ECLK(unsigned short ModeNo , unsigned short ModeIdIndex , unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo ) +void XGI_SetCRT2ECLK(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo) { unsigned char di_0, di_1, tempal; int i ; @@ -3224,7 +3228,7 @@ void XGI_SetCRT2ECLK(unsigned short ModeNo , unsigned short ModeIdIndex , unsign /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempcl , tempch , @@ -3332,7 +3336,7 @@ void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { /* if ( HwDeviceExtension->jChipType >= XG20 ) @@ -3354,7 +3358,7 @@ void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INF /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetVBType(PVB_DEVICE_INFO pVBInfo) +void XGI_GetVBType(struct vb_device_info *pVBInfo) { unsigned short flag , tempbx , tempah ; @@ -3417,7 +3421,7 @@ void XGI_GetVBType(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempax , push , @@ -3658,7 +3662,7 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetTVInfo(unsigned short ModeNo , unsigned short ModeIdIndex ,PVB_DEVICE_INFO pVBInfo ) +void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short temp , tempbx = 0 , @@ -3794,7 +3798,7 @@ void XGI_GetTVInfo(unsigned short ModeNo , unsigned short ModeIdIndex ,PVB_DEVIC /* Description : */ /* --------------------------------------------------------------------- */ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short temp , tempax , @@ -4005,7 +4009,7 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, /* --------------------------------------------------------------------- */ unsigned char XGI_SearchModeID(unsigned short ModeNo, unsigned short *ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { @@ -4016,7 +4020,7 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo, ModeNo |= 1 ; if ( ModeNo <= 0x13 ) { - /* for (*ModeIdIndex=0;*ModeIdIndexSModeIDTable)/sizeof(XGI_StStruct);(*ModeIdIndex)++) */ + /* for (*ModeIdIndex=0;*ModeIdIndexSModeIDTable)/sizeof(struct XGI_StStruct);(*ModeIdIndex)++) */ for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ ) { if (pVBInfo->SModeIDTable[*ModeIdIndex].St_ModeID == ModeNo) @@ -4034,7 +4038,7 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo, } else { - /* for (*ModeIdIndex=0;*ModeIdIndexEModeIDTable)/sizeof(XGI_ExtStruct);(*ModeIdIndex)++) */ + /* for (*ModeIdIndex=0;*ModeIdIndexEModeIDTable)/sizeof(struct XGI_ExtStruct);(*ModeIdIndex)++) */ for( *ModeIdIndex = 0 ; ; ( *ModeIdIndex )++ ) { if (pVBInfo->EModeIDTable[*ModeIdIndex].Ext_ModeID == ModeNo) @@ -4063,7 +4067,7 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo, unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short memorysize , modeflag , @@ -4145,7 +4149,7 @@ unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtensio /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -/*void XGINew_IsLowResolution(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) +/*void XGINew_IsLowResolution(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short data ; unsigned short ModeFlag ; @@ -4177,7 +4181,7 @@ unsigned char XGINew_CheckMemorySize(struct xgi_hw_device_info *HwDeviceExtensio /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE, PVB_DEVICE_INFO pVBInfo) +void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE, struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR(pVBInfo->P3c4,0x01,0xDF,0x00); @@ -4241,7 +4245,7 @@ void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE, PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_DisplayOff(struct xgi_hw_device_info *pXGIHWDE, PVB_DEVICE_INFO pVBInfo) +void XGI_DisplayOff(struct xgi_hw_device_info *pXGIHWDE, struct vb_device_info *pVBInfo) { if ( pXGIHWDE->jChipType == XG21 ) @@ -4289,7 +4293,7 @@ void XGI_DisplayOff(struct xgi_hw_device_info *pXGIHWDE, PVB_DEVICE_INFO pVBInfo /* Output : */ /* Description : chiawen for sensecrt1 */ /* --------------------------------------------------------------------- */ -void XGI_WaitDisply( PVB_DEVICE_INFO pVBInfo ) +void XGI_WaitDisply(struct vb_device_info *pVBInfo) { while( ( XGINew_GetReg2( pVBInfo->P3da ) & 0x01 ) ) break ; @@ -4305,7 +4309,7 @@ void XGI_WaitDisply( PVB_DEVICE_INFO pVBInfo ) /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SenseCRT1( PVB_DEVICE_INFO pVBInfo ) +void XGI_SenseCRT1(struct vb_device_info *pVBInfo) { unsigned char CRTCData[17] = { 0x5F , 0x4F , 0x50 , 0x82 , 0x55 , 0x81 , @@ -4425,7 +4429,7 @@ void XGI_SenseCRT1( PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_WaitDisplay( PVB_DEVICE_INFO pVBInfo ) +void XGI_WaitDisplay(struct vb_device_info *pVBInfo) { while( !( XGINew_GetReg2( pVBInfo->P3da ) & 0x01 ) ) ; @@ -4443,7 +4447,7 @@ void XGI_WaitDisplay( PVB_DEVICE_INFO pVBInfo ) /* --------------------------------------------------------------------- */ unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short tempbx , ModeIdIndex , @@ -4478,7 +4482,7 @@ unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_AutoThreshold( PVB_DEVICE_INFO pVBInfo ) +void XGI_AutoThreshold(struct vb_device_info *pVBInfo) { if ( !( pVBInfo->SetFlag & Win9xDOSMode ) ) XGINew_SetRegOR( pVBInfo->Part1Port , 0x01 , 0x40 ) ; @@ -4491,7 +4495,7 @@ void XGI_AutoThreshold( PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SaveCRT2Info(unsigned short ModeNo , PVB_DEVICE_INFO pVBInfo) +void XGI_SaveCRT2Info(unsigned short ModeNo, struct vb_device_info *pVBInfo) { unsigned short temp1 , temp2 ; @@ -4511,7 +4515,7 @@ void XGI_SaveCRT2Info(unsigned short ModeNo , PVB_DEVICE_INFO pVBInfo) /* --------------------------------------------------------------------- */ void XGI_GetCRT2ResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo ) + struct vb_device_info *pVBInfo) { unsigned short xres , yres , @@ -4608,7 +4612,7 @@ void XGI_GetCRT2ResInfo(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGI_IsLCDDualLink(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_IsLCDDualLink(struct vb_device_info *pVBInfo) { if ( ( ( ( pVBInfo->VBInfo & SetCRT2ToLCD ) | SetCRT2ToLCDA ) ) && ( pVBInfo->LCDInfo & SetLCDDualLink ) ) /* shampoo0129 */ @@ -4624,15 +4628,15 @@ unsigned char XGI_IsLCDDualLink(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetCRT2Data( unsigned short ModeNo , unsigned short ModeIdIndex , unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo ) +void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo) { unsigned short tempax = 0, tempbx , modeflag , resinfo ; - XGI_LCDDataStruct *LCDPtr = NULL ; - XGI_TVDataStruct *TVPtr = NULL ; + struct XGI_LCDDataStruct *LCDPtr = NULL ; + struct XGI_TVDataStruct *TVPtr = NULL ; if ( ModeNo <= 0x13 ) { @@ -4658,7 +4662,7 @@ void XGI_GetCRT2Data( unsigned short ModeNo , unsigned short ModeIdIndex , unsi if ( pVBInfo->VBInfo & ( SetCRT2ToLCD | SetCRT2ToLCDA ) ) { - LCDPtr = (XGI_LCDDataStruct* )XGI_GetLcdPtr( tempbx, ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + LCDPtr = (struct XGI_LCDDataStruct *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); pVBInfo->RVBHCMAX = LCDPtr->RVBHCMAX ; pVBInfo->RVBHCFACT = LCDPtr->RVBHCFACT ; @@ -4762,7 +4766,7 @@ void XGI_GetCRT2Data( unsigned short ModeNo , unsigned short ModeIdIndex , unsi if ( pVBInfo->VBInfo & ( SetCRT2ToTV ) ) { tempbx = 4 ; - TVPtr = ( XGI_TVDataStruct * )XGI_GetTVPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + TVPtr = (struct XGI_TVDataStruct *)XGI_GetTVPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); pVBInfo->RVBHCMAX = TVPtr->RVBHCMAX ; pVBInfo->RVBHCFACT = TVPtr->RVBHCFACT ; @@ -4850,7 +4854,7 @@ void XGI_GetCRT2Data( unsigned short ModeNo , unsigned short ModeIdIndex , unsi /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT2VCLK(unsigned short ModeNo , unsigned short ModeIdIndex , unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo ) +void XGI_SetCRT2VCLK(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo) { unsigned char di_0, di_1, tempal; @@ -4886,7 +4890,7 @@ void XGI_SetCRT2VCLK(unsigned short ModeNo , unsigned short ModeIdIndex , unsign /* Description : */ /* --------------------------------------------------------------------- */ void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short index ; @@ -4924,7 +4928,7 @@ void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1, /* --------------------------------------------------------------------- */ unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short index , @@ -5105,7 +5109,7 @@ unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_GetVCLKLen(unsigned char tempal, unsigned char *di_0, - unsigned char *di_1, PVB_DEVICE_INFO pVBInfo) + unsigned char *di_1, struct vb_device_info *pVBInfo) { if ( pVBInfo->IF_DEF_CH7007 == 1 ) /* [Billy] 2007/05/16 */ { @@ -5139,7 +5143,7 @@ void XGI_SetCRT2Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short offset ; unsigned char temp; @@ -5165,7 +5169,7 @@ void XGI_SetCRT2Offset(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetOffset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +unsigned short XGI_GetOffset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short temp , colordepth , @@ -5214,7 +5218,7 @@ unsigned short XGI_GetOffset(unsigned short ModeNo, unsigned short ModeIdIndex, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetCRT2FIFO( PVB_DEVICE_INFO pVBInfo) +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 */ @@ -5230,7 +5234,7 @@ void XGI_SetCRT2FIFO( PVB_DEVICE_INFO pVBInfo) void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short tempcx = 0 , CRT1Index = 0 , @@ -5266,7 +5270,7 @@ void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short temp = 0 , tempax = 0 , @@ -5444,7 +5448,7 @@ void XGI_SetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex, void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short push1 , push2 , @@ -5891,7 +5895,7 @@ void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) + struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short i , j , @@ -6409,7 +6413,7 @@ void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned s /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo) +void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo) { unsigned short push1 , push2 , @@ -6425,7 +6429,7 @@ void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct x modeflag , CRT1Index ; - XGI_LCDDesStruct *LCDBDesPtr = NULL ; + struct XGI_LCDDesStruct *LCDBDesPtr = NULL ; if ( ModeNo <= 0x13 ) @@ -6495,7 +6499,7 @@ void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct x /* Customized LCDB Des no add */ tempbx = 5 ; - LCDBDesPtr = ( XGI_LCDDesStruct * )XGI_GetLcdPtr( tempbx , ModeNo , ModeIdIndex , RefreshRateTableIndex, pVBInfo ) ; + LCDBDesPtr = (struct XGI_LCDDesStruct *)XGI_GetLcdPtr(tempbx, ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo); tempah = pVBInfo->LCDResInfo ; tempah &= PanelResInfo ; @@ -6663,14 +6667,14 @@ void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex, struct x /* Output : di -> Tap4 Reg. Setting Pointer */ /* Description : */ /* --------------------------------------------------------------------- */ -XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx, - PVB_DEVICE_INFO pVBInfo) +struct XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx, + struct vb_device_info *pVBInfo) { unsigned short tempax , tempbx , i ; - XGI301C_Tap4TimingStruct *Tap4TimingPtr ; + struct XGI301C_Tap4TimingStruct *Tap4TimingPtr ; if ( tempcx == 0 ) { @@ -6724,12 +6728,12 @@ XGI301C_Tap4TimingStruct *XGI_GetTap4Ptr(unsigned short tempcx, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetTap4Regs( PVB_DEVICE_INFO pVBInfo) +void XGI_SetTap4Regs(struct vb_device_info *pVBInfo) { unsigned short i , j ; - XGI301C_Tap4TimingStruct *Tap4TimingPtr ; + struct XGI301C_Tap4TimingStruct *Tap4TimingPtr ; if ( !( pVBInfo->VBType & VB_XGI301C ) ) return ; @@ -6762,7 +6766,7 @@ void XGI_SetTap4Regs( PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) +void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short i; unsigned char *tempdi; @@ -6849,7 +6853,7 @@ void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempax , tempcx , @@ -7100,7 +7104,7 @@ void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned s /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetGroup5(unsigned short ModeNo , unsigned short ModeIdIndex , PVB_DEVICE_INFO pVBInfo) +void XGI_SetGroup5(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short Pindex , Pdata ; @@ -7129,7 +7133,7 @@ void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short i , tempdx , @@ -7139,7 +7143,7 @@ void *XGI_GetLcdPtr(unsigned short BX, modeflag , table ; - XGI330_LCDDataTablStruct *tempdi = 0 ; + struct XGI330_LCDDataTablStruct *tempdi = 0 ; tempbx = BX; @@ -7634,10 +7638,10 @@ void *XGI_GetLcdPtr(unsigned short BX, void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short i , tempdx , tempbx , tempal , modeflag , table ; - XGI330_TVDataTablStruct *tempdi = 0 ; + struct XGI330_TVDataTablStruct *tempdi = 0 ; tempbx = BX ; @@ -7799,7 +7803,7 @@ void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo, /* Output : 1 -> Skip backlight control */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGI_BacklightByDrv(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_BacklightByDrv(struct vb_device_info *pVBInfo) { unsigned char tempah ; @@ -7818,7 +7822,7 @@ unsigned char XGI_BacklightByDrv(PVB_DEVICE_INFO pVBInfo) /* Description : Turn off VDD & Backlight : Fire disable procedure */ /* --------------------------------------------------------------------- */ /* -void XGI_FirePWDDisable( PVB_DEVICE_INFO pVBInfo ) +void XGI_FirePWDDisable(struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x26 , 0x00 , 0xFC ) ; } @@ -7830,7 +7834,7 @@ void XGI_FirePWDDisable( PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : Turn on VDD & Backlight : Fire enable procedure */ /* --------------------------------------------------------------------- */ -void XGI_FirePWDEnable(PVB_DEVICE_INFO pVBInfo ) +void XGI_FirePWDEnable(struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x26 , 0x03 , 0xFC ) ; } @@ -7842,7 +7846,7 @@ void XGI_FirePWDEnable(PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x63 , 0xBF , 0x40 ) ; } @@ -7854,7 +7858,7 @@ void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVIC /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR( pVBInfo->P3d4 , 0x63 , 0xBF , 0x00 ) ; @@ -7871,7 +7875,7 @@ void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVI /* : bl : 3 ; T3 : the duration between CPL off and signal off */ /* : bl : 4 ; T4 : the duration signal off and Vdd off */ /* --------------------------------------------------------------------- */ -void XGI_SetPanelDelay(unsigned short tempbl, PVB_DEVICE_INFO pVBInfo) +void XGI_SetPanelDelay(unsigned short tempbl, struct vb_device_info *pVBInfo) { unsigned short index ; @@ -7901,7 +7905,7 @@ void XGI_SetPanelDelay(unsigned short tempbl, PVB_DEVICE_INFO pVBInfo) /* = 1011b = 0Bh ; Backlight off, Power on */ /* = 1111b = 0Fh ; Backlight off, Power off */ /* --------------------------------------------------------------------- */ -void XGI_SetPanelPower(unsigned short tempah, unsigned short tempbl, PVB_DEVICE_INFO pVBInfo) +void XGI_SetPanelPower(unsigned short tempah, unsigned short tempbl, struct vb_device_info *pVBInfo) { if ( pVBInfo->VBType & ( VB_XGI301LV | VB_XGI302LV | VB_XGI301C ) ) XGINew_SetRegANDOR( pVBInfo->Part4Port , 0x26 , tempbl , tempah ) ; @@ -7930,7 +7934,7 @@ unsigned char XG21GPIODataTransfer(unsigned char ujDate) /* bl[1] : LVDS backlight */ /* bl[0] : LVDS VDD */ /*----------------------------------------------------------------------------*/ -unsigned char XGI_XG21GetPSCValue(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_XG21GetPSCValue(struct vb_device_info *pVBInfo) { unsigned char CR4A, temp; @@ -7951,7 +7955,7 @@ unsigned char XGI_XG21GetPSCValue(PVB_DEVICE_INFO pVBInfo) /* bl[1] : LVDS backlight */ /* bl[0] : LVDS VDD */ /*----------------------------------------------------------------------------*/ -unsigned char XGI_XG27GetPSCValue(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_XG27GetPSCValue(struct vb_device_info *pVBInfo) { unsigned char CR4A, CRB4, temp; @@ -7976,7 +7980,7 @@ unsigned char XGI_XG27GetPSCValue(PVB_DEVICE_INFO pVBInfo) /* 000010b : clear bit 1, to set bit1 */ /* 000001b : clear bit 0, to set bit0 */ /*----------------------------------------------------------------------------*/ -void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl, PVB_DEVICE_INFO pVBInfo) +void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl, struct vb_device_info *pVBInfo) { unsigned char CR4A, temp; @@ -8001,7 +8005,7 @@ void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl, PVB_DEVIC XGINew_SetReg1( pVBInfo->P3d4 , 0x48 , temp ) ; } -void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, PVB_DEVICE_INFO pVBInfo) +void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, struct vb_device_info *pVBInfo) { unsigned char CR4A, temp; unsigned short tempbh0, tempbl0; @@ -8032,15 +8036,13 @@ void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, PVB_DEVIC } /* --------------------------------------------------------------------- */ -unsigned short XGI_GetLVDSOEMTableIndex(PVB_DEVICE_INFO pVBInfo) +unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo) { unsigned short index ; index = XGINew_GetReg1( pVBInfo->P3d4 , 0x36 ) ; - if (indexPart4Port , 0x27 , 0x7F ) ; /* disable PWD */ } @@ -8584,7 +8586,7 @@ void XGI_DisablePWD( PVB_DEVICE_INFO pVBInfo ) /* Output : 0 -> Not LCD Mode */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGI_DisableChISLCD(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_DisableChISLCD(struct vb_device_info *pVBInfo) { unsigned short tempbx , tempah ; @@ -8614,7 +8616,7 @@ unsigned char XGI_DisableChISLCD(PVB_DEVICE_INFO pVBInfo) /* Output : 0 -> Not LCD mode */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGI_EnableChISLCD(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo) { unsigned short tempbx , tempah ; @@ -8645,7 +8647,7 @@ unsigned char XGI_EnableChISLCD(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetLCDCapPtr(PVB_DEVICE_INFO pVBInfo) +unsigned short XGI_GetLCDCapPtr(struct vb_device_info *pVBInfo) { unsigned char tempal , tempah , @@ -8684,7 +8686,7 @@ unsigned short XGI_GetLCDCapPtr(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetLCDCapPtr1(PVB_DEVICE_INFO pVBInfo) +unsigned short XGI_GetLCDCapPtr1(struct vb_device_info *pVBInfo) { unsigned short tempah , tempal , @@ -8730,7 +8732,7 @@ unsigned short XGI_GetLCDCapPtr1(PVB_DEVICE_INFO pVBInfo) /* Description : */ /* --------------------------------------------------------------------- */ void XGI_GetLCDSync(unsigned short *HSyncWidth , unsigned short *VSyncWidth, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short Index ; @@ -8749,7 +8751,7 @@ void XGI_GetLCDSync(unsigned short *HSyncWidth , unsigned short *VSyncWidth, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempbl , tempah ; @@ -8962,7 +8964,7 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_I /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempax , tempbx , @@ -9143,7 +9145,7 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_ /* A : Ext750p */ /* B : St750p */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetTVPtrIndex(PVB_DEVICE_INFO pVBInfo) +unsigned short XGI_GetTVPtrIndex(struct vb_device_info *pVBInfo) { unsigned short tempbx = 0 ; @@ -9170,7 +9172,7 @@ unsigned short XGI_GetTVPtrIndex(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : Customized Param. for 301 */ /* --------------------------------------------------------------------- */ -void XGI_OEM310Setting(unsigned short ModeNo , unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) +void XGI_OEM310Setting(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { if ( pVBInfo->SetFlag & Win9xDOSMode ) return ; @@ -9200,7 +9202,7 @@ void XGI_OEM310Setting(unsigned short ModeNo , unsigned short ModeIdIndex, PVB_D /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetDelayComp( PVB_DEVICE_INFO pVBInfo ) +void XGI_SetDelayComp(struct vb_device_info *pVBInfo) { unsigned short index ; @@ -9278,7 +9280,7 @@ void XGI_SetDelayComp( PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetLCDCap( PVB_DEVICE_INFO pVBInfo ) +void XGI_SetLCDCap(struct vb_device_info *pVBInfo) { unsigned short tempcx ; @@ -9321,7 +9323,7 @@ void XGI_SetLCDCap( PVB_DEVICE_INFO pVBInfo ) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetLCDCap_A(unsigned short tempcx, PVB_DEVICE_INFO pVBInfo) +void XGI_SetLCDCap_A(unsigned short tempcx, struct vb_device_info *pVBInfo) { unsigned short temp ; @@ -9361,7 +9363,7 @@ void XGI_SetLCDCap_A(unsigned short tempcx, PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetLCDCap_B(unsigned short tempcx, PVB_DEVICE_INFO pVBInfo) +void XGI_SetLCDCap_B(unsigned short tempcx, struct vb_device_info *pVBInfo) { if ( tempcx & EnableLCD24bpp ) /* 24bits */ XGINew_SetRegANDOR(pVBInfo->Part2Port, 0x1A, 0xE0, @@ -9378,7 +9380,7 @@ void XGI_SetLCDCap_B(unsigned short tempcx, PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void SetSpectrum( PVB_DEVICE_INFO pVBInfo ) +void SetSpectrum(struct vb_device_info *pVBInfo) { unsigned short index ; @@ -9405,7 +9407,7 @@ void SetSpectrum( PVB_DEVICE_INFO pVBInfo ) /* Description : Set TV Customized Param. */ /* --------------------------------------------------------------------- */ void XGI_SetAntiFlicker(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short tempbx , index ; @@ -9441,7 +9443,7 @@ void XGI_SetAntiFlicker(unsigned short ModeNo, unsigned short ModeIdIndex, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetEdgeEnhance(unsigned short ModeNo , unsigned short ModeIdIndex , PVB_DEVICE_INFO pVBInfo) +void XGI_SetEdgeEnhance(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short tempbx , index ; @@ -9475,7 +9477,7 @@ void XGI_SetEdgeEnhance(unsigned short ModeNo , unsigned short ModeIdIndex , PVB /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_SetPhaseIncr( PVB_DEVICE_INFO pVBInfo ) +void XGI_SetPhaseIncr(struct vb_device_info *pVBInfo) { unsigned short tempbx ; @@ -9505,7 +9507,7 @@ void XGI_SetPhaseIncr( PVB_DEVICE_INFO pVBInfo ) /* Description : */ /* --------------------------------------------------------------------- */ void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short tempbx , index ; @@ -9610,7 +9612,7 @@ void XGI_SetYFilter(unsigned short ModeNo, unsigned short ModeIdIndex, /* Description : */ /* --------------------------------------------------------------------- */ void XGI_GetTVPtrIndex2(unsigned short *tempbx, unsigned char *tempcl, - unsigned char *tempch, PVB_DEVICE_INFO pVBInfo) + unsigned char *tempch, struct vb_device_info *pVBInfo) { *tempbx = 0 ; *tempcl = 0 ; @@ -9654,7 +9656,7 @@ void XGI_GetTVPtrIndex2(unsigned short *tempbx, unsigned char *tempcl, /* --------------------------------------------------------------------- */ void XGI_SetCRT2ModeRegs(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short tempbl ; short tempcl ; @@ -9883,7 +9885,7 @@ void XGI_SetCRT2ModeRegs(unsigned short ModeNo, /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_CloseCRTC(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_CloseCRTC(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempbx ; @@ -9902,7 +9904,7 @@ void XGI_CloseCRTC(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_OpenCRTC(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_OpenCRTC(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { unsigned short tempbx ; @@ -9918,7 +9920,7 @@ void XGI_OpenCRTC(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_GetRAMDAC2DATA(unsigned short ModeNo , unsigned short ModeIdIndex , unsigned short RefreshRateTableIndex, PVB_DEVICE_INFO pVBInfo ) +void XGI_GetRAMDAC2DATA(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct vb_device_info *pVBInfo) { unsigned short tempax , tempbx , @@ -9983,7 +9985,7 @@ void XGI_GetRAMDAC2DATA(unsigned short ModeNo , unsigned short ModeIdIndex , uns /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetColorDepth(unsigned short ModeNo , unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo) +unsigned short XGI_GetColorDepth(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { unsigned short ColorDepth[ 6 ] = { 1 , 2 , 4 , 4 , 6 , 8 } ; short index ; @@ -10014,7 +10016,7 @@ unsigned short XGI_GetColorDepth(unsigned short ModeNo , unsigned short ModeIdIn /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2f , 0xFF , 0x01 ) ; @@ -10028,7 +10030,7 @@ void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_IN /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO pVBInfo) +void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR( pVBInfo->Part1Port , 0x2F , 0xFE , 0x00 ) ; @@ -10043,7 +10045,7 @@ void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_EnableCRT2( PVB_DEVICE_INFO pVBInfo) +void XGINew_EnableCRT2(struct vb_device_info *pVBInfo) { XGINew_SetRegANDOR( pVBInfo->P3c4 , 0x1E , 0xFF , 0x20 ) ; } @@ -10056,7 +10058,7 @@ void XGINew_EnableCRT2( PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGINew_LCD_Wait_Time(unsigned char DelayTime, PVB_DEVICE_INFO pVBInfo) +void XGINew_LCD_Wait_Time(unsigned char DelayTime, struct vb_device_info *pVBInfo) { unsigned short i , j ; @@ -10093,7 +10095,7 @@ void XGINew_LCD_Wait_Time(unsigned char DelayTime, PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned char XGI_BridgeIsOn(PVB_DEVICE_INFO pVBInfo) +unsigned char XGI_BridgeIsOn(struct vb_device_info *pVBInfo) { unsigned short flag ; @@ -10119,7 +10121,7 @@ unsigned char XGI_BridgeIsOn(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_LongWait(PVB_DEVICE_INFO pVBInfo) +void XGI_LongWait(struct vb_device_info *pVBInfo) { unsigned short i ; @@ -10148,7 +10150,7 @@ void XGI_LongWait(PVB_DEVICE_INFO pVBInfo) /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -void XGI_VBLongWait( PVB_DEVICE_INFO pVBInfo ) +void XGI_VBLongWait(struct vb_device_info *pVBInfo) { unsigned short tempal , temp , @@ -10207,7 +10209,7 @@ return ; /* Output : */ /* Description : */ /* --------------------------------------------------------------------- */ -unsigned short XGI_GetVGAHT2( PVB_DEVICE_INFO pVBInfo ) +unsigned short XGI_GetVGAHT2(struct vb_device_info *pVBInfo) { unsigned long tempax , tempbx ; @@ -10230,7 +10232,7 @@ unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, - PVB_DEVICE_INFO pVBInfo) + struct vb_device_info *pVBInfo) { unsigned short tempbx ; diff --git a/drivers/staging/xgifb/vb_setmode.h b/drivers/staging/xgifb/vb_setmode.h index 0d061d7..0dcc297 100644 --- a/drivers/staging/xgifb/vb_setmode.h +++ b/drivers/staging/xgifb/vb_setmode.h @@ -1,42 +1,42 @@ #ifndef _VBSETMODE_ #define _VBSETMODE_ -extern void InitTo330Pointer(unsigned char, PVB_DEVICE_INFO); -extern void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern void XGI_LongWait( PVB_DEVICE_INFO ); +extern void InitTo330Pointer(unsigned char, struct vb_device_info *); +extern void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern void XGI_LongWait(struct vb_device_info *); extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo, struct xgi_hw_device_info *, - PVB_DEVICE_INFO); -extern void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern void XGI_DisplayOff(struct xgi_hw_device_info *, PVB_DEVICE_INFO); -extern void XGI_DisplayOn(struct xgi_hw_device_info *, PVB_DEVICE_INFO); -extern void XGI_GetVBType(PVB_DEVICE_INFO); -extern void XGI_SenseCRT1(PVB_DEVICE_INFO ); -extern void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern void XGI_GetTVInfo(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO ); -extern void XGI_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern void XGI_WaitDisply( PVB_DEVICE_INFO ); -extern unsigned short XGI_GetResInfo(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo); + struct vb_device_info *); +extern void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern void XGI_DisplayOff(struct xgi_hw_device_info *, struct vb_device_info *); +extern void XGI_DisplayOn(struct xgi_hw_device_info *, struct vb_device_info *); +extern void XGI_GetVBType(struct vb_device_info *); +extern void XGI_SenseCRT1(struct vb_device_info *); +extern void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *); +extern void XGI_SetCRT1Offset(unsigned short ModeNo, unsigned short ModeIdIndex, unsigned short RefreshRateTableIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern void XGI_WaitDisply(struct vb_device_info *); +extern unsigned short XGI_GetResInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); extern unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension, unsigned short ModeNo) ; -extern unsigned char XGI_SearchModeID( unsigned short ModeNo,unsigned short *ModeIdIndex, PVB_DEVICE_INFO ); -extern unsigned char XGI_GetLCDInfo(unsigned short ModeNo,unsigned short ModeIdIndex,PVB_DEVICE_INFO ); -extern unsigned char XGI_BridgeIsOn( PVB_DEVICE_INFO ); -extern unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, PVB_DEVICE_INFO); -extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, PVB_DEVICE_INFO); +extern unsigned char XGI_SearchModeID(unsigned short ModeNo, unsigned short *ModeIdIndex, struct vb_device_info *); +extern unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *); +extern unsigned char XGI_BridgeIsOn(struct vb_device_info *); +extern unsigned char XGI_SetCRT2Group301(unsigned short ModeNo, struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *); +extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *); -extern void XGI_SetXG21FPBits(PVB_DEVICE_INFO pVBInfo); -extern void XGI_SetXG27FPBits(PVB_DEVICE_INFO pVBInfo); -extern void XGI_XG21BLSignalVDD(unsigned short tempbh,unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); -extern void XGI_XG27BLSignalVDD(unsigned short tempbh,unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); -extern void XGI_XG21SetPanelDelay(unsigned short tempbl, PVB_DEVICE_INFO pVBInfo); -extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo ); -extern void XGI_SetXG21LVDSPara(unsigned short ModeNo,unsigned short ModeIdIndex, PVB_DEVICE_INFO pVBInfo ); -extern unsigned short XGI_GetLVDSOEMTableIndex(PVB_DEVICE_INFO pVBInfo); +extern void XGI_SetXG21FPBits(struct vb_device_info *pVBInfo); +extern void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo); +extern void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl, struct vb_device_info *pVBInfo); +extern void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, struct vb_device_info *pVBInfo); +extern void XGI_XG21SetPanelDelay(unsigned short tempbl, struct vb_device_info *pVBInfo); +extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +extern void XGI_SetXG21LVDSPara(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); +extern unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo); #endif diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 1d401c0..9c6e0c7 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -10,12 +10,12 @@ -typedef struct _XGI_PanelDelayTblStruct +struct XGI_PanelDelayTblStruct { unsigned char timer[2]; -} XGI_PanelDelayTblStruct; +}; -typedef struct _XGI_LCDDataStruct +struct XGI_LCDDataStruct { unsigned short RVBHCMAX; unsigned short RVBHCFACT; @@ -23,20 +23,21 @@ typedef struct _XGI_LCDDataStruct unsigned short VGAVT; unsigned short LCDHT; unsigned short LCDVT; -} XGI_LCDDataStruct; +}; -typedef struct _XGI_LVDSCRT1HDataStruct +struct XGI_LVDSCRT1HDataStruct { unsigned char Reg[8]; -} XGI_LVDSCRT1HDataStruct; -typedef struct _XGI_LVDSCRT1VDataStruct +}; + +struct XGI_LVDSCRT1VDataStruct { unsigned char Reg[7]; -} XGI_LVDSCRT1VDataStruct; +}; -typedef struct _XGI_TVDataStruct +struct XGI_TVDataStruct { unsigned short RVBHCMAX; unsigned short RVBHCFACT; @@ -51,31 +52,30 @@ typedef struct _XGI_TVDataStruct unsigned char RY2COE; unsigned char RY3COE; unsigned char RY4COE; -} XGI_TVDataStruct; +}; -typedef struct _XGI_LVDSDataStruct +struct XGI_LVDSDataStruct { unsigned short VGAHT; unsigned short VGAVT; unsigned short LCDHT; unsigned short LCDVT; -} XGI_LVDSDataStruct; +}; -typedef struct _XGI_LVDSDesStruct +struct XGI_LVDSDesStruct { unsigned short LCDHDES; unsigned short LCDVDES; -} XGI_LVDSDesStruct; +}; -typedef struct _XGI_LVDSCRT1DataStruct +struct XGI_LVDSCRT1DataStruct { unsigned char CR[15]; -} XGI_LVDSCRT1DataStruct; +}; /*add for LCDA*/ - -typedef struct _XGI_StStruct +struct XGI_StStruct { unsigned char St_ModeID; unsigned short St_ModeFlag; @@ -86,9 +86,9 @@ typedef struct _XGI_StStruct unsigned char VB_StTVFlickerIndex; unsigned char VB_StTVEdgeIndex; unsigned char VB_StTVYFilterIndex; -} XGI_StStruct; +}; -typedef struct _XGI_StandTableStruct +struct XGI_StandTableStruct { unsigned char CRT_COLS; unsigned char ROWS; @@ -99,9 +99,9 @@ typedef struct _XGI_StandTableStruct unsigned char CRTC[0x19]; unsigned char ATTR[0x14]; unsigned char GRC[9]; -} XGI_StandTableStruct; +}; -typedef struct _XGI_ExtStruct +struct XGI_ExtStruct { unsigned char Ext_ModeID; unsigned short Ext_ModeFlag; @@ -114,9 +114,9 @@ typedef struct _XGI_ExtStruct unsigned char VB_ExtTVEdgeIndex; unsigned char VB_ExtTVYFilterIndex; unsigned char REFindex; -} XGI_ExtStruct; +}; -typedef struct _XGI_Ext2Struct +struct XGI_Ext2Struct { unsigned short Ext_InfoFlag; unsigned char Ext_CRT1CRTC; @@ -127,93 +127,93 @@ typedef struct _XGI_Ext2Struct unsigned short XRes; unsigned short YRes; /* unsigned short ROM_OFFSET; */ -} XGI_Ext2Struct; +}; -typedef struct _XGI_MCLKDataStruct +struct XGI_MCLKDataStruct { unsigned char SR28, SR29, SR2A; unsigned short CLOCK; -} XGI_MCLKDataStruct; +}; -typedef struct _XGI_ECLKDataStruct +struct XGI_ECLKDataStruct { unsigned char SR2E, SR2F, SR30; unsigned short CLOCK; -} XGI_ECLKDataStruct; +}; -typedef struct _XGI_VCLKDataStruct +struct XGI_VCLKDataStruct { unsigned char SR2B, SR2C; unsigned short CLOCK; -} XGI_VCLKDataStruct; +}; -typedef struct _XGI_VBVCLKDataStruct +struct XGI_VBVCLKDataStruct { unsigned char Part4_A, Part4_B; unsigned short CLOCK; -} XGI_VBVCLKDataStruct; +}; -typedef struct _XGI_StResInfoStruct +struct XGI_StResInfoStruct { unsigned short HTotal; unsigned short VTotal; -} XGI_StResInfoStruct; +}; -typedef struct _XGI_ModeResInfoStruct +struct XGI_ModeResInfoStruct { unsigned short HTotal; unsigned short VTotal; unsigned char XChar; unsigned char YChar; -} XGI_ModeResInfoStruct; +}; -typedef struct _XGI_LCDNBDesStruct +struct XGI_LCDNBDesStruct { unsigned char NB[12]; -} XGI_LCDNBDesStruct; +}; /*add for new UNIVGABIOS*/ -typedef struct _XGI_LCDDesStruct +struct XGI_LCDDesStruct { unsigned short LCDHDES; unsigned short LCDHRS; unsigned short LCDVDES; unsigned short LCDVRS; -} XGI_LCDDesStruct; +}; -typedef struct _XGI_LCDDataTablStruct +struct XGI_LCDDataTablStruct { unsigned char PANELID; unsigned short MASK; unsigned short CAP; unsigned short DATAPTR; -} XGI_LCDDataTablStruct; +}; -typedef struct _XGI_TVTablDataStruct +struct XGI_TVTablDataStruct { unsigned short MASK; unsigned short CAP; unsigned short DATAPTR; -} XGI_TVDataTablStruct; +}; -typedef struct _XGI330_LCDDesDataStruct +struct XGI330_LCDDataDesStruct { unsigned short LCDHDES; unsigned short LCDHRS; unsigned short LCDVDES; unsigned short LCDVRS; -} XGI330_LCDDataDesStruct; +}; -typedef struct _XGI330_LVDSDataStruct +struct XGI330_LVDSDataStruct { unsigned short VGAHT; unsigned short VGAVT; unsigned short LCDHT; unsigned short LCDVT; -} XGI330_LVDSDataStruct; +}; -typedef struct _XGI330_LCDDesDataStruct2 +struct XGI330_LCDDataDesStruct2 { unsigned short LCDHDES; unsigned short LCDHRS; @@ -221,9 +221,9 @@ typedef struct _XGI330_LCDDesDataStruct2 unsigned short LCDVRS; unsigned short LCDHSync; unsigned short LCDVSync; -} XGI330_LCDDataDesStruct2; +}; -typedef struct _XGI330_LCDDataStruct +struct XGI330_LCDDataStruct { unsigned short RVBHCMAX; unsigned short RVBHCFACT; @@ -231,10 +231,10 @@ typedef struct _XGI330_LCDDataStruct unsigned short VGAVT; unsigned short LCDHT; unsigned short LCDVT; -} XGI330_LCDDataStruct; +}; -typedef struct _XGI330_TVDataStruct +struct XGI330_TVDataStruct { unsigned short RVBHCMAX; unsigned short RVBHCFACT; @@ -245,63 +245,63 @@ typedef struct _XGI330_TVDataStruct unsigned short RVBHRS; unsigned char FlickerMode; unsigned short HALFRVBHRS; -} XGI330_TVDataStruct; +}; -typedef struct _XGI330_LCDDataTablStruct +struct XGI330_LCDDataTablStruct { unsigned char PANELID; unsigned short MASK; unsigned short CAP; unsigned short DATAPTR; -} XGI330_LCDDataTablStruct; +}; -typedef struct _XGI330_TVDataTablStruct +struct XGI330_TVDataTablStruct { unsigned short MASK; unsigned short CAP; unsigned short DATAPTR; -} XGI330_TVDataTablStruct; +}; -typedef struct _XGI330_CHTVDataStruct +struct XGI330_CHTVDataStruct { unsigned short VGAHT; unsigned short VGAVT; unsigned short LCDHT; unsigned short LCDVT; -} XGI330_CHTVDataStruct; +}; -typedef struct _XGI_TimingHStruct +struct XGI_TimingHStruct { unsigned char data[8]; -} XGI_TimingHStruct; +}; -typedef struct _XGI_TimingVStruct +struct XGI_TimingVStruct { unsigned char data[7]; -} XGI_TimingVStruct; +}; -typedef struct _XGI_CH7007TV_TimingHStruct +struct XGI_CH7007TV_TimingHStruct { unsigned char data[10]; -} XGI_CH7007TV_TimingHStruct; +}; -typedef struct _XGI_CH7007TV_TimingVStruct +struct XGI_CH7007TV_TimingVStruct { unsigned char data[10]; -} XGI_CH7007TV_TimingVStruct; +}; -typedef struct _XGI_XG21CRT1Struct +struct XGI_XG21CRT1Struct { unsigned char ModeID, CR02, CR03, CR15, CR16; -} XGI_XG21CRT1Struct; +}; -typedef struct _XGI330_CHTVRegDataStruct +struct XGI330_CHTVRegDataStruct { unsigned char Reg[16]; -} XGI330_CHTVRegDataStruct; +}; -typedef struct _XGI330_LCDCapStruct +struct XGI330_LCDCapStruct { unsigned char LCD_ID; unsigned short LCD_Capability; @@ -328,9 +328,9 @@ typedef struct _XGI330_LCDCapStruct unsigned char Spectrum_32; unsigned char Spectrum_33; unsigned char Spectrum_34; -} XGI330_LCDCapStruct; +}; -typedef struct _XGI21_LVDSCapStruct +struct XGI21_LVDSCapStruct { unsigned short LVDS_Capability; unsigned short LVDSHT; @@ -348,27 +348,27 @@ typedef struct _XGI21_LVDSCapStruct unsigned char PSC_S3; unsigned char PSC_S4; unsigned char PSC_S5; -} XGI21_LVDSCapStruct; +}; -typedef struct _XGI_CRT1TableStruct +struct XGI_CRT1TableStruct { unsigned char CR[16]; -} XGI_CRT1TableStruct; +}; -typedef struct _XGI330_VCLKDataStruct +struct XGI330_VCLKDataStruct { unsigned char SR2B, SR2C; unsigned short CLOCK; -} XGI330_VCLKDataStruct; +}; -typedef struct _XGI301C_Tap4TimingStruct +struct XGI301C_Tap4TimingStruct { unsigned short DE; unsigned char Reg[64]; /* C0-FF */ -} XGI301C_Tap4TimingStruct; +}; -typedef struct _XGI_New_StandTableStruct +struct XGI_New_StandTableStruct { unsigned char CRT_COLS; unsigned char ROWS; @@ -379,17 +379,9 @@ typedef struct _XGI_New_StandTableStruct unsigned char CRTC[0x19]; unsigned char ATTR[0x14]; unsigned char GRC[9]; -} XGI_New_StandTableStruct; - -typedef unsigned char DRAM8Type[8]; -typedef unsigned char DRAM4Type[4]; -typedef unsigned char DRAM32Type[32]; -typedef unsigned char DRAM2Type[2]; +}; -typedef struct _VB_DEVICE_INFO VB_DEVICE_INFO; -typedef VB_DEVICE_INFO * PVB_DEVICE_INFO; - -struct _VB_DEVICE_INFO +struct vb_device_info { unsigned char ISXPDOS; unsigned long P3c4,P3d4,P3c0,P3ce,P3c2,P3cc; @@ -420,13 +412,14 @@ struct _VB_DEVICE_INFO unsigned long BaseAddr; unsigned long RelIO; - DRAM4Type *CR6B; - DRAM4Type *CR6E; - DRAM32Type *CR6F; - DRAM2Type *CR89; + unsigned char (*CR6B)[4]; + unsigned char (*CR6E)[4]; + unsigned char (*CR6F)[32]; + unsigned char (*CR89)[2]; + + unsigned char (*SR15)[8]; + unsigned char (*CR40)[8]; - DRAM8Type *SR15; /* pointer : point to array */ - DRAM8Type *CR40; unsigned char *pSoftSetting; unsigned char *pOutputSelect; @@ -466,8 +459,8 @@ struct _VB_DEVICE_INFO unsigned char *pCRT2Data_4_D; unsigned char *pCRT2Data_4_E; unsigned char *pCRT2Data_4_10; - XGI_MCLKDataStruct *MCLKData; - XGI_ECLKDataStruct *ECLKData; + struct XGI_MCLKDataStruct *MCLKData; + struct XGI_ECLKDataStruct *ECLKData; unsigned char *XGI_TVDelayList; unsigned char *XGI_TVDelayList2; @@ -494,27 +487,27 @@ struct _VB_DEVICE_INFO unsigned char *pXGINew_I2CDefinition ; unsigned char *pXGINew_CR97 ; - XGI330_LCDCapStruct *LCDCapList; - XGI21_LVDSCapStruct *XG21_LVDSCapList; + struct XGI330_LCDCapStruct *LCDCapList; + struct XGI21_LVDSCapStruct *XG21_LVDSCapList; - XGI_TimingHStruct *TimingH; - XGI_TimingVStruct *TimingV; + struct XGI_TimingHStruct *TimingH; + struct XGI_TimingVStruct *TimingV; - XGI_StStruct *SModeIDTable; - XGI_StandTableStruct *StandTable; - XGI_ExtStruct *EModeIDTable; - XGI_Ext2Struct *RefIndex; + struct XGI_StStruct *SModeIDTable; + struct XGI_StandTableStruct *StandTable; + struct XGI_ExtStruct *EModeIDTable; + struct XGI_Ext2Struct *RefIndex; /* XGINew_CRT1TableStruct *CRT1Table; */ - XGI_CRT1TableStruct *XGINEWUB_CRT1Table; - XGI_VCLKDataStruct *VCLKData; - XGI_VBVCLKDataStruct *VBVCLKData; - XGI_StResInfoStruct *StResInfo; - XGI_ModeResInfoStruct *ModeResInfo; - XGI_XG21CRT1Struct *UpdateCRT1; -}; /* _VB_DEVICE_INFO */ + struct XGI_CRT1TableStruct *XGINEWUB_CRT1Table; + struct XGI_VCLKDataStruct *VCLKData; + struct XGI_VBVCLKDataStruct *VBVCLKData; + struct XGI_StResInfoStruct *StResInfo; + struct XGI_ModeResInfoStruct *ModeResInfo; + struct XGI_XG21CRT1Struct *UpdateCRT1; +}; /* _struct vb_device_info */ -typedef struct +struct TimingInfo { unsigned short Horizontal_ACTIVE; unsigned short Horizontal_FP; @@ -528,7 +521,7 @@ typedef struct unsigned char FrameRate; unsigned char Interlace; unsigned short Margin; -} TimingInfo; +}; #define _VB_STRUCT_ #endif /* _VB_STRUCT_ */ diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index 5f394d0..510ef76 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -1,7 +1,7 @@ #define Tap4 -XGI_MCLKDataStruct XGI330New_MCLKData[]= +struct XGI_MCLKDataStruct XGI330New_MCLKData[] = { { 0x5c,0x23,0x01,166}, { 0x5c,0x23,0x01,166}, @@ -13,7 +13,7 @@ XGI_MCLKDataStruct XGI330New_MCLKData[]= { 0x29,0x01,0x81,300} }; //yilin modify for xgi20 -XGI_MCLKDataStruct XGI340New_MCLKData[]= +struct XGI_MCLKDataStruct XGI340New_MCLKData[] = { { 0x16,0x01,0x01,166}, { 0x19,0x02,0x01,124}, @@ -25,7 +25,7 @@ XGI_MCLKDataStruct XGI340New_MCLKData[]= { 0x5c,0x23,0x01,166} }; -XGI_MCLKDataStruct XGI27New_MCLKData[]= +struct XGI_MCLKDataStruct XGI27New_MCLKData[] = { { 0x5c,0x23,0x01,166}, { 0x19,0x02,0x01,124}, @@ -37,7 +37,7 @@ XGI_MCLKDataStruct XGI27New_MCLKData[]= { 0x5c,0x23,0x01,166} }; -XGI_ECLKDataStruct XGI330_ECLKData[]= +struct XGI_ECLKDataStruct XGI330_ECLKData[] = { { 0x7c,0x08,0x01,200}, { 0x7c,0x08,0x01,200}, @@ -49,7 +49,7 @@ XGI_ECLKDataStruct XGI330_ECLKData[]= { 0x29,0x01,0x81,300} }; //yilin modify for xgi20 -XGI_ECLKDataStruct XGI340_ECLKData[]= +struct XGI_ECLKDataStruct XGI340_ECLKData[] = { { 0x5c,0x23,0x01,166}, { 0x55,0x84,0x01,123}, @@ -211,7 +211,7 @@ unsigned char XGI330_SR33 = 0x00; unsigned char XG40_CRCF = 0x13; unsigned char XG40_DRAMTypeDefinition = 0xFF ; -XGI_StStruct XGI330_SModeIDTable[]= +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 +236,7 @@ XGI_StStruct XGI330_SModeIDTable[]= }; -XGI_ExtStruct XGI330_EModeIDTable[]= +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 +308,7 @@ XGI_ExtStruct XGI330_EModeIDTable[]= {0xff,0x0000,0x0000,0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00} }; -XGI_StandTableStruct XGI330_StandTable[]= +struct XGI_StandTableStruct XGI330_StandTable[] = { /* MD_0_200 */ { @@ -746,13 +746,13 @@ XGI_StandTableStruct XGI330_StandTable[]= } }; -XGI_TimingHStruct XGI_TimingH[]= +struct XGI_TimingHStruct XGI_TimingH[] = {{{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}}; -XGI_TimingVStruct XGI_TimingV[]= +struct XGI_TimingVStruct XGI_TimingV[] = {{{0x00,0x00,0x00,0x00,0x00,0x00,0x00}}}; -XGI_XG21CRT1Struct XGI_UpdateCRT1Table[]= +struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = { {0x01,0x27,0x91,0x8f,0xc0}, /* 00 */ {0x03,0x4f,0x83,0x8f,0xc0}, /* 01 */ @@ -773,7 +773,7 @@ XGI_XG21CRT1Struct XGI_UpdateCRT1Table[]= {0x59,0x27,0x91,0x8f,0xc0} /* 16 */ }; -XGI_CRT1TableStruct XGI_CRT1Table[]= +struct XGI_CRT1TableStruct XGI_CRT1Table[] = { {{0x2d,0x28,0x90,0x2c,0x90,0x00,0x04,0x00, 0xbf,0x1f,0x9c,0x8e,0x96,0xb9,0x30}}, /* 0x0 */ @@ -921,7 +921,7 @@ XGI_CRT1TableStruct XGI_CRT1Table[]= 0x03,0xDE,0xC0,0x84,0xBF,0x04,0x90}} /* 0x47 */ }; -XGI330_CHTVRegDataStruct XGI_CHTVRegUNTSC[] = { +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 +932,7 @@ 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 */ }; -XGI330_CHTVRegDataStruct XGI_CHTVRegONTSC[]= { +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 +943,7 @@ 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 */ }; -XGI330_CHTVRegDataStruct XGI_CHTVRegUPAL[]= { +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 +954,7 @@ 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 */ }; -XGI330_CHTVRegDataStruct XGI_CHTVRegOPAL[]={ +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) */ @@ -972,7 +972,7 @@ unsigned char XGI_CH7017LV1400x1050[] = {0x60, 0x03, 0x11, 0x00, 0x40, 0xE3, 0xA /*add for new UNIVGABIOS*/ -XGI330_LCDDataStruct XGI_StLCD1024x768Data[]= +struct XGI330_LCDDataStruct XGI_StLCD1024x768Data[] = { { 62, 25, 800, 546,1344, 806}, { 32, 15, 930, 546,1344, 806}, @@ -983,7 +983,7 @@ XGI330_LCDDataStruct XGI_StLCD1024x768Data[]= { 1, 1,1344, 806,1344, 806} }; -XGI330_LCDDataStruct XGI_ExtLCD1024x768Data[]= +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 */ @@ -1000,7 +1000,7 @@ XGI330_LCDDataStruct XGI_ExtLCD1024x768Data[]= { 1, 1,1344, 806,1344, 806} }; -/*XGI330_LCDDataStruct XGI_St2LCD1024x768Data[]= +/*struct XGI330_LCDDataStruct XGI_St2LCD1024x768Data[] = { { 62, 25, 800, 546,1344, 806}, { 32, 15, 930, 546,1344, 806}, @@ -1011,7 +1011,7 @@ XGI330_LCDDataStruct XGI_ExtLCD1024x768Data[]= { 1, 1,1344, 806,1344, 806} };*/ -XGI330_LCDDataStruct XGI_CetLCD1024x768Data[]= +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 +1022,7 @@ XGI330_LCDDataStruct XGI_CetLCD1024x768Data[]= { 1,1,1344,806,1344,806 } /* 06 (1024x768x60Hz) */ }; -XGI330_LCDDataStruct XGI_StLCD1280x1024Data[]= +struct XGI330_LCDDataStruct XGI_StLCD1280x1024Data[] = { { 22, 5, 800, 510,1650,1088}, { 22, 5, 800, 510,1650,1088}, @@ -1034,7 +1034,7 @@ XGI330_LCDDataStruct XGI_StLCD1280x1024Data[]= { 1, 1,1688,1066,1688,1066} }; -XGI330_LCDDataStruct XGI_ExtLCD1280x1024Data[]= +struct XGI330_LCDDataStruct XGI_ExtLCD1280x1024Data[] = { { 211, 60,1024, 501,1688,1066}, { 211, 60,1024, 508,1688,1066}, @@ -1046,7 +1046,7 @@ XGI330_LCDDataStruct XGI_ExtLCD1280x1024Data[]= { 1, 1,1688,1066,1688,1066} }; -XGI330_LCDDataStruct XGI_St2LCD1280x1024Data[]= +struct XGI330_LCDDataStruct XGI_St2LCD1280x1024Data[] = { { 22, 5, 800, 510,1650,1088}, { 22, 5, 800, 510,1650,1088}, @@ -1058,7 +1058,7 @@ XGI330_LCDDataStruct XGI_St2LCD1280x1024Data[]= { 1, 1,1688,1066,1688,1066} }; -XGI330_LCDDataStruct XGI_CetLCD1280x1024Data[]= +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 +1071,7 @@ XGI330_LCDDataStruct XGI_CetLCD1280x1024Data[]= { 1,1,1688,1066,1688,1066 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataStruct XGI_StLCD1400x1050Data[]= +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 +1084,7 @@ XGI330_LCDDataStruct XGI_StLCD1400x1050Data[]= { 1,1,1688,1066,1688,1066 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataStruct XGI_ExtLCD1400x1050Data[]= +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 +1097,7 @@ XGI330_LCDDataStruct XGI_ExtLCD1400x1050Data[]= { 1,1,1688,1066,1688,1066 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataStruct XGI_ExtLCD1600x1200Data[]= +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 +1111,7 @@ XGI330_LCDDataStruct XGI_ExtLCD1600x1200Data[]= { 1,1,2160,1250,2160,1250 } /* 09 (1600x1200x60Hz) ;302lv */ }; -XGI330_LCDDataStruct XGI_StLCD1600x1200Data[]= +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 +1125,7 @@ XGI330_LCDDataStruct XGI_StLCD1600x1200Data[]= { 1,1,2160,1250,2160,1250 } /* 09 (1600x1200) */ }; -XGI330_LCDDataStruct XGI_CetLCD1400x1050Data[]= +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 +1138,7 @@ XGI330_LCDDataStruct XGI_CetLCD1400x1050Data[]= { 1,1,1688,1066,1688,1066 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataStruct XGI_NoScalingData[]= +struct XGI330_LCDDataStruct XGI_NoScalingData[] = { { 1, 1, 800, 449, 800, 449}, { 1, 1, 800, 449, 800, 449}, @@ -1150,7 +1150,7 @@ XGI330_LCDDataStruct XGI_NoScalingData[]= { 1, 1,1688,1066,1688,1066} }; -XGI330_LCDDataStruct XGI_ExtLCD1024x768x75Data[]= +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 +1161,7 @@ XGI330_LCDDataStruct XGI_ExtLCD1024x768x75Data[]= {1,1,1312,800,1312,800 } /* ; 06 (1024x768x75Hz) */ }; -XGI330_LCDDataStruct XGI_StLCD1024x768x75Data[]= +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) */ @@ -1172,7 +1172,7 @@ XGI330_LCDDataStruct XGI_StLCD1024x768x75Data[]= {1,1,1312,800,1312,800 } /* ; 06 (1024x768x75Hz) */ }; -XGI330_LCDDataStruct XGI_CetLCD1024x768x75Data[]= +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 +1183,7 @@ XGI330_LCDDataStruct XGI_CetLCD1024x768x75Data[]= {1,1,1312,800,1312,800} /* ; 06 (1024x768x75Hz) */ }; -XGI330_LCDDataStruct XGI_ExtLCD1280x1024x75Data[]= +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 +1195,7 @@ XGI330_LCDDataStruct XGI_ExtLCD1280x1024x75Data[]= {1,1,1688,1066,1688,1066 } /* ; 07 (1280x1024x75Hz) */ }; -XGI330_LCDDataStruct XGI_StLCD1280x1024x75Data[]= +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 +1207,7 @@ XGI330_LCDDataStruct XGI_StLCD1280x1024x75Data[]= {1,1,1688,1066,1688,1066 } /* ; 07 (1280x1024x75Hz) */ }; -XGI330_LCDDataStruct XGI_CetLCD1280x1024x75Data[]= +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 +1219,7 @@ XGI330_LCDDataStruct XGI_CetLCD1280x1024x75Data[]= {1,1,1688,1066,1688,1066} /* ; 07 (1280x1024x75Hz) */ }; -XGI330_LCDDataStruct XGI_NoScalingDatax75[]= +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 +1234,7 @@ XGI330_LCDDataStruct XGI_NoScalingDatax75[]= {1,1,1688,806,1688,806 } /* ; 0A (1280x768x75Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768Data[]= +struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768Data[] = { { 9,1057,0, 771 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 9,1057,0, 771 }, /* ; 01 (320x350,640x350) */ @@ -1245,7 +1245,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768Data[]= { 9,1057,805, 770 } /* ; 06 (1024x768x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDes1024x768Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768Data[] = { { 9,1057,737,703 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 9,1057,686,651 }, /* ; 01 (320x350,640x350) */ @@ -1256,7 +1256,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDes1024x768Data[]= { 9,1057,805,770 } /* ; 06 (1024x768x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768Data[]= +struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768Data[] = { { 1152,856,622,587 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 1152,856,597,562 }, /* ; 01 (320x350,640x350) */ @@ -1267,7 +1267,7 @@ XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768Data[]= { 0,1048,805,770 } /* ; 06 (1024x768x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024Data[]= +struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024Data[] = { { 18,1346,981,940 },/* 00 (320x200,320x400,640x200,640x400) */ { 18,1346,926,865 },/* 01 (320x350,640x350) */ @@ -1279,7 +1279,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024Data[]= { 18,1346,1065,1024 }/* 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024Data[] = { { 18,1346,970,907 },/* 00 (320x200,320x400,640x200,640x400) */ { 18,1346,917,854 },/* 01 (320x350,640x350) */ @@ -1291,7 +1291,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024Data[]= { 18,1346,1065,1024 }/* 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024Data[]= +struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024Data[] = { { 1368,1008,752,711 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1368,1008,729,688 }, /* 01 (320x350,640x350) */ @@ -1303,7 +1303,7 @@ XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024Data[]= { 18,1346,1065,1024 } /* 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024Data[]= +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 +1315,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024Data[]= { 9,1337,1065,1024 } /* ; 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024Data[] = { { 9,1337,970,907 }, /* ; 00 (320x200,320x400,640x200,640x400) */ { 9,1337,917,854 }, /* ; 01 (320x350,640x350) */ @@ -1327,7 +1327,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024Data[]= { 9,1337,1065,1024 } /* ; 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024Data[]= +struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024Data[] = { { 1368,1008,752,711 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1368,1008,729,688 }, /* 01 (320x350,640x350) */ @@ -1339,7 +1339,7 @@ XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024Data[]= { 9,1337,1065,1024 } /* 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDLDes1400x1050Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1400x1050Data[] = { { 18,1464,0,1051 }, /* 00 (320x200,320x400,640x200,640x400) */ { 18,1464,0,1051 }, /* 01 (320x350,640x350) */ @@ -1352,7 +1352,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDLDes1400x1050Data[]= { 18,1464,0,1051 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1400x1050Data[]= +struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1400x1050Data[] = { { 18,1464,0,1051 }, /* 00 (320x200,320x400,640x200,640x400) */ { 18,1464,0,1051 }, /* 01 (320x350,640x350) */ @@ -1365,7 +1365,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1400x1050Data[]= { 18,1464,0,1051 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDes1400x1050Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDes1400x1050Data[] = { { 9,1455,0,1051 },/* 00 (320x200,320x400,640x200,640x400) */ { 9,1455,0,1051 },/* 01 (320x350,640x350) */ @@ -1378,7 +1378,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDes1400x1050Data[]= { 9,1455,0,1051 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDes1400x1050Data[]= +struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1400x1050Data[] = { { 9,1455,0,1051 },/* 00 (320x200,320x400,640x200,640x400) */ { 9,1455,0,1051 },/* 01 (320x350,640x350) */ @@ -1391,7 +1391,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDes1400x1050Data[]= { 9,1455,0,1051 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data[]= +struct XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data[] = { { 1308,1068,781,766 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1308,1068,781,766 }, /* 01 (320x350,640x350) */ @@ -1404,7 +1404,7 @@ XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data[]= { 18,1464,0,1051 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data2[]= +struct XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data2[] = { { 0,1448,0,1051 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1448,0,1051 }, /* 01 (320x350,640x350) */ @@ -1415,7 +1415,7 @@ XGI330_LCDDataDesStruct XGI_CetLCDDes1400x1050Data2[]= -XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1600x1200Data[]= +struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1600x1200Data[] = { { 18,1682,0,1201 }, /* 00 (320x200,320x400,640x200,640x400) */ { 18,1682,0,1201 }, /* 01 (320x350,640x350) */ @@ -1429,7 +1429,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1600x1200Data[]= { 18,1682,0,1201 } /* 09 (1600x1200x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDLDes1600x1200Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1600x1200Data[] = { { 18,1682,1150,1101 }, /* 00 (320x200,320x400,640x200,640x400) */ { 18,1682,1083,1034 }, /* 01 (320x350,640x350) */ @@ -1443,7 +1443,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDLDes1600x1200Data[]= { 18,1682,0,1201 } /* 09 (1600x1200x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDes1600x1200Data[]= +struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1600x1200Data[] = { { 9,1673,0,1201 },/* 00 (320x200,320x400,640x200,640x400) */ { 9,1673,0,1201 },/* 01 (320x350,640x350) */ @@ -1457,7 +1457,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDes1600x1200Data[]= { 9,1673,0,1201 } /* 09 (1600x1200x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDes1600x1200Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDes1600x1200Data[] = { { 9,1673,1150,1101 },/* 00 (320x200,320x400,640x200,640x400) */ { 9,1673,1083,1034 },/* 01 (320x350,640x350) */ @@ -1471,7 +1471,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDes1600x1200Data[]= { 9,1673,0,1201 } /* 09 (1600x1200x60Hz) */ }; -XGI330_LCDDataDesStruct2 XGI_NoScalingDesData[]= +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 +1486,7 @@ XGI330_LCDDataDesStruct2 XGI_NoScalingDesData[]= { 9,1337,0,771,112,6 } /* 0A (1280x768x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768x75Data[]= /* ;;1024x768x75Hz */ +struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768x75Data[] = /* ;;1024x768x75Hz */ { {9,1049,0,769}, /* ; 00 (320x200,320x400,640x200,640x400) */ {9,1049,0,769}, /* ; 01 (320x350,640x350) */ @@ -1497,7 +1497,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768x75Data[]= /* ;;1024x768x75Hz */ {9,1049,0,769} /* ; 06 (1024x768x75Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDes1024x768x75Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768x75Data[] = { {9,1049,0,769}, /* ; 00 (320x200,320x400,640x200,640x400) */ {9,1049,0,769}, /* ; 01 (320x350,640x350) */ @@ -1508,7 +1508,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDes1024x768x75Data[]= {9,1049,0,769} /* ; 06 (1024x768x75Hz) */ }; -XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768x75Data[]= /* ;;1024x768x75Hz */ +struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768x75Data[] = /* ;;1024x768x75Hz */ { {1152,856,622,587}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1152,856,597,562}, /* ; 01 (320x350,640x350) */ @@ -1519,7 +1519,7 @@ XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768x75Data[]= /* ;;1024x768x75Hz */ {9,1049,0,769} /* ; 06 (1024x768x75Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024x75Data[]= /* ;;1280x1024x75Hz */ +struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024x75Data[] = /* ;;1280x1024x75Hz */ { {18,1314,0,1025 },/* ; 00 (320x200,320x400,640x200,640x400) */ {18,1314,0,1025 },/* ; 01 (320x350,640x350) */ @@ -1531,7 +1531,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024x75Data[]= /* ;;1280x10 {18,1314,0,1025 }/* ; 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024x75Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024x75Data[] = { {18,1314,0,1025 },/* ; 00 (320x200,320x400,640x200,640x400) */ {18,1314,0,1025 },/* ; 01 (320x350,640x350) */ @@ -1543,7 +1543,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024x75Data[]= {18,1314,0,1025 }/* ; 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024x75Data[]= /* 1280x1024x75Hz */ +struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024x75Data[] = /* 1280x1024x75Hz */ { {1368,1008,752,711}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1368,1008,729,688}, /* ; 01 (320x350,640x350) */ @@ -1555,7 +1555,7 @@ XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024x75Data[]= /* 1280x1024x75Hz */ {18,1314,0,1025} /* ; 07 (1280x1024x75Hz) */ }; -XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024x75Data[]= /* ;;1280x1024x75Hz */ +struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024x75Data[] = /* ;;1280x1024x75Hz */ { {9,1305,0,1025},/* ; 00 (320x200,320x400,640x200,640x400) */ {9,1305,0,1025},/* ; 01 (320x350,640x350) */ @@ -1567,7 +1567,7 @@ XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024x75Data[]= /* ;;1280x1024 {9,1305,0,1025} /* ; 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024x75Data[]= +struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024x75Data[] = { {9,1305,0,1025},/* ; 00 (320x200,320x400,640x200,640x400) */ {9,1305,0,1025},/* ; 01 (320x350,640x350) */ @@ -1579,7 +1579,7 @@ XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024x75Data[]= {9,1305,0,1025} /* ; 07 (1280x1024x60Hz) */ }; -XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024x75Data[]= /* 1280x1024x75Hz */ +struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024x75Data[] = /* 1280x1024x75Hz */ { {1368,1008,752,711}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1368,1008,729,688}, /* ; 01 (320x350,640x350) */ @@ -1591,7 +1591,7 @@ XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024x75Data[]= /* 1280x1024x75Hz */ {9,1305,0,1025} /* ; 07 (1280x1024x75Hz) */ }; -XGI330_LCDDataDesStruct2 XGI_NoScalingDesDatax75[]= /* Scaling LCD 75Hz */ +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 +1606,7 @@ XGI330_LCDDataDesStruct2 XGI_NoScalingDesDatax75[]= /* Scaling LCD 75Hz */ {9,1337,0,771,112,6} /* ; 0A (1280x768x60Hz) */ }; -XGI330_TVDataStruct XGI_StPALData[]= +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 +1616,7 @@ XGI330_TVDataStruct XGI_StPALData[]= { 1, 1, 864, 525,1270, 600, 50, 0, 0} }; -XGI330_TVDataStruct XGI_ExtPALData[]= +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 +1628,7 @@ XGI330_TVDataStruct XGI_ExtPALData[]= { 3, 2,1080, 619,1270, 540, 438, 0, 438} }; -XGI330_TVDataStruct XGI_StNTSCData[]= +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 +1637,7 @@ XGI330_TVDataStruct XGI_StNTSCData[]= { 1, 1, 858, 525,1270, 480, 0, 0, 760} }; -XGI330_TVDataStruct XGI_ExtNTSCData[]= +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 +1650,7 @@ XGI330_TVDataStruct XGI_ExtNTSCData[]= { 3, 2,1001, 533,1270, 420, 0, 0, 0} }; -XGI330_TVDataStruct XGI_St1HiTVData[]= +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 +1660,7 @@ XGI330_TVDataStruct XGI_St1HiTVData[]= { 8,5,1050,683,1648,960,0x150,1,0 } /* 05 (400x300,800x600) */ }; -XGI330_TVDataStruct XGI_St2HiTVData[]= +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 +1671,7 @@ XGI330_TVDataStruct XGI_St2HiTVData[]= }; -XGI330_TVDataStruct XGI_ExtHiTVData[]= +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 +1687,7 @@ XGI330_TVDataStruct XGI_ExtHiTVData[]= }; -XGI330_TVDataStruct XGI_ExtYPbPr525iData[]= +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 +1700,7 @@ XGI330_TVDataStruct XGI_ExtYPbPr525iData[]= { 3, 2,1001, 533,1250, 420, 0, 0, 0} }; -XGI330_TVDataStruct XGI_StYPbPr525iData[]= +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 +1709,7 @@ XGI330_TVDataStruct XGI_StYPbPr525iData[]= { 1, 1, 858, 525,1270, 480, 0, 0, 760}, }; -XGI330_TVDataStruct XGI_ExtYPbPr525pData[]= +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 +1722,7 @@ XGI330_TVDataStruct XGI_ExtYPbPr525pData[]= { 3, 2,1001, 533,1270, 420, 0, 0, 0} }; -XGI330_TVDataStruct XGI_StYPbPr525pData[]= +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 +1731,7 @@ XGI330_TVDataStruct XGI_StYPbPr525pData[]= { 1, 1,1716, 525,1270, 480, 0, 0, 760}, }; -XGI330_TVDataStruct XGI_ExtYPbPr750pData[]= +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 +1746,7 @@ XGI330_TVDataStruct XGI_ExtYPbPr750pData[]= { 10, 9,1320, 830,1130, 640, 50, 0, 0} }; -XGI330_TVDataStruct XGI_StYPbPr750pData[]= +struct XGI330_TVDataStruct XGI_StYPbPr750pData[] = { { 1, 1,1650, 750,1280, 400, 50, 0, 760}, { 1, 1,1650, 750,1280, 350, 50, 0, 640}, @@ -1928,7 +1928,7 @@ unsigned char XGI330_Ren750pGroup3[] = 0x18,0x1D,0x23,0x28,0x4C,0xAA,0x01 }; -XGI_PanelDelayTblStruct XGI330_PanelDelayTbl[]= +struct XGI_PanelDelayTblStruct XGI330_PanelDelayTbl[] = { {{0x00,0x00}}, {{0x00,0x00}}, @@ -1948,7 +1948,7 @@ XGI_PanelDelayTblStruct XGI330_PanelDelayTbl[]= {{0x00,0x00}} }; -XGI330_LVDSDataStruct XGI330_LVDS320x480Data_1[]= +struct XGI330_LVDSDataStruct XGI330_LVDS320x480Data_1[] = { {848, 433,400,525}, {848, 389,400,525}, @@ -1961,7 +1961,7 @@ XGI330_LVDSDataStruct XGI330_LVDS320x480Data_1[]= {800, 525,1000, 635} }; -XGI330_LVDSDataStruct XGI330_LVDS800x600Data_1[]= +struct XGI330_LVDSDataStruct XGI330_LVDS800x600Data_1[] = { {848, 433,1060, 629}, {848, 389,1060, 629}, @@ -1974,7 +1974,7 @@ XGI330_LVDSDataStruct XGI330_LVDS800x600Data_1[]= {800, 525,1000, 635} }; -XGI330_LVDSDataStruct XGI330_LVDS800x600Data_2[]= +struct XGI330_LVDSDataStruct XGI330_LVDS800x600Data_2[] = { {1056, 628,1056, 628}, {1056, 628,1056, 628}, @@ -1987,7 +1987,7 @@ XGI330_LVDSDataStruct XGI330_LVDS800x600Data_2[]= {800, 525,1000, 635} }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1[] = { { 960 , 438 , 1344 , 806 } , /* 00 (320x200,320x400,640x200,640x400) */ { 960 , 388 , 1344 , 806 } , /* 01 (320x350,640x350) */ @@ -1999,7 +1999,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1[]= }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2[] = { {1344, 806,1344, 806}, {1344, 806,1344, 806}, @@ -2012,7 +2012,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2[]= {800, 525,1280, 813} }; -XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1[] = { {1048, 442,1688, 1066}, {1048, 392,1688, 1066}, @@ -2024,7 +2024,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1[]= {1688, 1066,1688, 1066} }; -XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2[] = { {1344, 806,1344, 806}, {1344, 806,1344, 806}, @@ -2037,7 +2037,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2[]= {800, 525,1280, 813} }; /* -XGI330_LVDSDataStruct XGI_LVDS1280x768Data_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x768Data_1[] = { {768,438,1408,806}, {768,388,1408,806}, @@ -2050,7 +2050,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x768Data_1[]= {1408,806,1408,806} }; -XGI330_LVDSDataStruct XGI_LVDS1280x768Data_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x768Data_2[] = { {1408, 806,1408, 806}, {1408, 806,1408, 806}, @@ -2063,7 +2063,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x768Data_2[]= {1408, 806,1408, 806} }; -XGI330_LVDSDataStruct XGI_LVDS1280x768NData_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x768NData_1[] = { {704, 438,1344, 806}, {704, 388,1344, 806}, @@ -2076,7 +2076,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x768NData_1[]= {1344, 806,1344, 806} }; -XGI330_LVDSDataStruct XGI_LVDS1280x768NData_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x768NData_2[] = { {1344, 806,1344, 806}, {1344, 806,1344, 806}, @@ -2089,7 +2089,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x768NData_2[]= {1344, 806,1344, 806} }; -XGI330_LVDSDataStruct XGI_LVDS1280x768SData_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x768SData_1[] = { {1048,438,1688,806}, {1048,388,1688,806}, @@ -2102,7 +2102,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x768SData_1[]= {1688,806,1688,806} }; -XGI330_LVDSDataStruct XGI_LVDS1280x768SData_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x768SData_2[] = { {1688,806,1688,806}, {1688,806,1688,806}, @@ -2115,7 +2115,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x768SData_2[]= {1688,806,1688,806} }; */ -XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_1[] = { {928,416,1688,1066}, {928,366,1688,1066}, @@ -2128,7 +2128,7 @@ XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_1[]= {1688,1066,1688,1066} }; -XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_2[] = { {1688,1066,1688,1066}, {1688,1066,1688,1066}, @@ -2141,7 +2141,7 @@ XGI330_LVDSDataStruct XGI_LVDS1400x1050Data_2[]= {1688,1066,1688,1066} }; -XGI330_LVDSDataStruct XGI_LVDS1600x1200Data_1[]= +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 +2155,7 @@ XGI330_LVDSDataStruct XGI_LVDS1600x1200Data_1[]= { 2048,1320,2048,1320 } /* 09 (1600x1200) */ }; -XGI330_LVDSDataStruct XGI_LVDSNoScalingData[]= +struct XGI330_LVDSDataStruct XGI_LVDSNoScalingData[] = { { 800,449,800,449 }, /* 00 (320x200,320x400,640x200,640x400) */ { 800,449,800,449 }, /* 01 (320x350,640x350) */ @@ -2170,7 +2170,7 @@ XGI330_LVDSDataStruct XGI_LVDSNoScalingData[]= { 1688,806,1688,806 } /* 0A (1280x768x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1x75[]= +struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1x75[] = { {960,438,1312,800 }, /* 00 (320x200,320x400,640x200,640x400) */ {960,388,1312,800 }, /* 01 (320x350,640x350) */ @@ -2182,7 +2182,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Data_1x75[]= }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2x75[]= +struct XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2x75[] = { {1312,800,1312,800}, /* ; 00 (320x200,320x400,640x200,640x400) */ {1312,800,1312,800}, /* ; 01 (320x350,640x350) */ @@ -2193,7 +2193,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Data_2x75[]= {1312,800,1312,800}, /* ; 06 (512x384,1024x768) */ }; -XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1x75[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1x75[] = { {1048,442,1688,1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {1048,392,1688,1066 }, /* ; 01 (320x350,640x350) */ @@ -2205,7 +2205,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_1x75[]= {1688,1066,1688,1066 }, /* ; 06; 07 (640x512,1280x1024) */ }; -XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2x75[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2x75[] = { {1688,1066,1688,1066 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {1688,1066,1688,1066 }, /* ; 01 (320x350,640x350) */ @@ -2217,7 +2217,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x1024Data_2x75[]= {1688,1066,1688,1066 }, /* ; 06; 07 (640x512,1280x1024) */ }; -XGI330_LVDSDataStruct XGI_LVDSNoScalingDatax75[]= +struct XGI330_LVDSDataStruct XGI_LVDSNoScalingDatax75[] = { {800,449,800,449 }, /* ; 00 (320x200,320x400,640x200,640x400) */ {800,449,800,449 }, /* ; 01 (320x350,640x350) */ @@ -2232,7 +2232,7 @@ XGI330_LVDSDataStruct XGI_LVDSNoScalingDatax75[]= {1688,806,1688,806 }, /* ; 0A (1280x768x75Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1[] = { { 0,1048, 0, 771 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1048, 0, 771 }, /* 01 (320x350,640x350) */ @@ -2243,7 +2243,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1[]= { 0,1048, 805, 770 } /* 06 (1024x768x60Hz) */ } ; -XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2[] = { { 1142, 856, 622, 587 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1142, 856, 597, 562 }, /* 01 (320x350,640x350) */ @@ -2254,7 +2254,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2[]= { 0,1048, 805, 771 } /* 06 (1024x768x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3[]= +struct XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3[] = { { 320, 24, 622, 587 }, /* 00 (320x200,320x400,640x200,640x400) */ { 320, 24, 597, 562 }, /* 01 (320x350,640x350) */ @@ -2263,7 +2263,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3[]= { 320, 24, 722, 687 } /* 04 (640x480x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1[] = { { 0,1328, 0, 1025 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1328, 0, 1025 }, /* 01 (320x350,640x350) */ @@ -2276,7 +2276,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1[]= }; /* The Display setting for DE Mode Panel */ -XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2[] = { { 1368,1008,752,711 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1368,1008,729,688 }, /* 01 (320x350,640x350) */ @@ -2288,7 +2288,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2[]= { 0000,1328,0,1025 } /* 07 (1280x1024x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_1[] = { { 0,1448,0,1051 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1448,0,1051 }, /* 01 (320x350,640x350) */ @@ -2301,7 +2301,7 @@ XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_1[]= { 0,1448,0,1051 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_2[]= +struct XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_2[] = { { 1308,1068, 781, 766 }, /* 00 (320x200,320x400,640x200,640x400) */ { 1308,1068, 781, 766 }, /* 01 (320x350,640x350) */ @@ -2314,7 +2314,7 @@ XGI330_LVDSDataStruct XGI_LVDS1400x1050Des_2[]= { 0,1448,0,1051 } /* 08 (1400x1050x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1600x1200Des_1[]= +struct XGI330_LVDSDataStruct XGI_LVDS1600x1200Des_1[] = { { 0,1664,0,1201 }, /* 00 (320x200,320x400,640x200,640x400) */ { 0,1664,0,1201 }, /* 01 (320x350,640x350) */ @@ -2330,7 +2330,7 @@ XGI330_LVDSDataStruct XGI_LVDS1600x1200Des_1[]= -XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesData[]= +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 +2345,7 @@ XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesData[]= { 0,1328,0,0771, 112, 6 } /* 0A (1280x768x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1x75[]= /* ; 1024x768 Full-screen */ +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 +2356,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Des_1x75[]= /* ; 1024x768 Full-screen */ {0,1040,0,769} /* ; 06 (1024x768x75Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2x75[]= /* ; 1024x768 center-screen (Enh. Mode) */ +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 +2367,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Des_2x75[]= /* ; 1024x768 center-screen (E { 0,1048,805,771 } /* 06 (1024x768x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3x75[]= /* ; 1024x768 center-screen (St.Mode) */ +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 +2376,7 @@ XGI330_LVDSDataStruct XGI_LVDS1024x768Des_3x75[]= /* ; 1024x768 center-screen (S {320,24,722,687 } /* ; 04 (640x480x60Hz) */ }; -XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1x75[]= +struct XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1x75[] = { {0,1296,0,1025}, /* ; 00 (320x200,320x400,640x200,640x400) */ {0,1296,0,1025}, /* ; 01 (320x350,640x350) */ @@ -2389,7 +2389,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_1x75[]= }; /* The Display setting for DE Mode Panel */ -XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2x75[]= /* [ycchen] 02/18/03 Set DE as default */ +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 +2401,7 @@ XGI330_LVDSDataStruct XGI_LVDS1280x1024Des_2x75[]= /* [ycchen] 02/18/03 Set DE {0,1296,0,1025 } /* ; 07 (1280x1024x75Hz) */ }; -XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[]= /* Scaling LCD 75Hz */ +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 +2416,7 @@ XGI330_LCDDataDesStruct2 XGI_LVDSNoScalingDesDatax75[]= /* Scaling LCD 75Hz */ { 0,1328,0,771,112,6 } /* ; 0A (1280x768x75Hz) */ }; -XGI330_LVDSDataStruct XGI330_LVDS640x480Data_1[]= +struct XGI330_LVDSDataStruct XGI330_LVDS640x480Data_1[] = { {800, 449, 800, 449}, {800, 449, 800, 449}, @@ -2429,7 +2429,7 @@ XGI330_LVDSDataStruct XGI330_LVDS640x480Data_1[]= {1056, 628,1056, 628} }; -XGI330_CHTVDataStruct XGI_CHTVUNTSCData[]= +struct XGI330_CHTVDataStruct XGI_CHTVUNTSCData[] = { {840, 600, 840, 600}, {840, 600, 840, 600}, @@ -2439,7 +2439,7 @@ XGI330_CHTVDataStruct XGI_CHTVUNTSCData[]= {1064, 750,1064, 750} }; -XGI330_CHTVDataStruct XGI_CHTVONTSCData[]= +struct XGI330_CHTVDataStruct XGI_CHTVONTSCData[] = { {840, 525, 840, 525}, {840, 525, 840, 525}, @@ -2449,7 +2449,7 @@ XGI330_CHTVDataStruct XGI_CHTVONTSCData[]= {1040, 700,1040, 700} }; -XGI330_CHTVDataStruct XGI_CHTVUPALData[]= +struct XGI330_CHTVDataStruct XGI_CHTVUPALData[] = { {1008, 625,1008, 625}, {1008, 625,1008, 625}, @@ -2459,7 +2459,7 @@ XGI330_CHTVDataStruct XGI_CHTVUPALData[]= {936, 836, 936, 836} }; -XGI330_CHTVDataStruct XGI_CHTVOPALData[]= +struct XGI330_CHTVDataStruct XGI_CHTVOPALData[] = { {1008, 625,1008, 625}, {1008, 625,1008, 625}, @@ -2469,7 +2469,7 @@ XGI330_CHTVDataStruct XGI_CHTVOPALData[]= {960, 750, 960, 750} }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_H[]= +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 +2482,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_H[]= {{ 0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* 07 (1024x) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_H[]= +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 +2496,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_H[]= {{ 0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* 08 (1280x) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_H[]= +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 +2509,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_H[]= {{ 0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* 07 (1024x) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_H[]= +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 +2523,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_H[]= {{ 0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* 08 (1280x) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[]= +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 +2537,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_1_H[]= {{ 0xCE,0xAE,0x92,0xB3,0x01,0x00,0x03,0x00 }} /* 09 (1400x) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[]= +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 +2551,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11400x1050_2_H[]= {{ 0xCE,0xAE,0x92,0xBC,0x0A,0x00,0x03,0x00 }} /* 09 (1400x) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[]= +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 +2567,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11600x1200_1_H[]= {{ 0xFB,0xC7,0x9F,0xC9,0x81,0x00,0x07,0x00 }} /* 0A (1600x) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[]= +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 +2576,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_V[]= {{ 0x24,0xF5,0x02,0x88,0xFF,0x25,0x90 }} /* 04 (x768) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[]= +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 +2585,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_V[]= {{ 0x24,0xF5,0x02,0x88,0xFF,0x25,0x90 }} /* 04 (x768) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[]= +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 +2595,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_V[]= {{ 0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9 }} /* 05 (x1024) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[]= +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 +2605,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_V[]= {{ 0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9 }} /* 05 (x1024) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[]= +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 +2616,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_1_V[]= {{ 0x28,0x10,0x1A,0x80,0x19,0x29,0x0F }} /* 06 (x1050) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[]= +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 +2627,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11400x1050_2_V[]= {{ 0x28,0x10,0x1A,0x87,0x19,0x29,0x8F }} /* 06 (x1050) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[]= +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 +2640,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11600x1200_1_V[]= {{ 0x26,0x11,0xd3,0x86,0xaF,0x27,0x3f }} /* 07 (x1200) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[]= +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 +2652,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_1_Hx75[]= {{ 0x9F,0x7F,0x83,0x85,0x91,0x00,0x02,0x00 }} /* ; 07 (1024x) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[]= +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 +2661,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_1_Vx75[]= {{ 0x1E,0xF5,0x00,0x83,0xFF,0x1F,0x90 }} /* ; 04 (x768) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[]= +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 +2673,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11024x768_2_Hx75[]= {{ 0xA3,0x7F,0x87,0x86,0x97,0x00,0x02,0x00 }} /* ; 07 (1024x) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[]= +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 +2682,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11024x768_2_Vx75[]= {{ 0x24,0xF5,0x02,0x88,0xFF,0x25,0x90 }} /* ; 04 (x768) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[]= +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 +2695,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_1_Hx75[]= {{ 0xCE,0x9F,0x92,0xA5,0x17,0x00,0x07,0x00 }} /* ; 08 (1280x) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[]= +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 +2705,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_1_Vx75[]= {{ 0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9 }} /* ; 05 (x1024) */ }; -XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[]= +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 +2719,7 @@ XGI_LVDSCRT1HDataStruct XGI_LVDSCRT11280x1024_2_Hx75[]= {{ 0xCE,0x9F,0x92,0xA8,0x16,0x00,0x07,0x00 }} /* ; 08 (1280x) */ }; -XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[]= +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 +2730,7 @@ XGI_LVDSCRT1VDataStruct XGI_LVDSCRT11280x1024_2_Vx75[]= {{ 0x28,0x5A,0x13,0x87,0xFF,0x29,0xA9 }} /* ; 05 (x1024) */ }; -XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UNTSC[]= +struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UNTSC[] = { {{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e, 0xe8,0x84,0x8f,0x57,0x20,0x00,0x01,0x00 }}, @@ -2746,7 +2746,7 @@ XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UNTSC[]= 0x90,0x8c,0x57,0xed,0x20,0x00,0x06,0x01 }} }; -XGI_LVDSCRT1DataStruct XGI_CHTVCRT1ONTSC[]= +struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1ONTSC[] = { {{0x64,0x4f,0x88,0x5a,0x9f,0x0b,0x3e, 0xc0,0x84,0x8f,0x0c,0x20,0x00,0x01,0x00 }}, @@ -2762,7 +2762,7 @@ XGI_LVDSCRT1DataStruct XGI_CHTVCRT1ONTSC[]= 0x7f,0x86,0x57,0xbb,0x00,0x00,0x06,0x01 }} }; -XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UPAL[]= +struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UPAL[] = { {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e, 0xf8,0x83,0x8f,0x70,0x20,0x00,0x05,0x00 }}, @@ -2778,7 +2778,7 @@ XGI_LVDSCRT1DataStruct XGI_CHTVCRT1UPAL[]= 0xc8,0x8c,0x57,0xe9,0x20,0x00,0x05,0x01 }} }; -XGI_LVDSCRT1DataStruct XGI_CHTVCRT1OPAL[]= +struct XGI_LVDSCRT1DataStruct XGI_CHTVCRT1OPAL[] = { {{0x79,0x4f,0x9d,0x5a,0x90,0x6f,0x3e, 0xf0,0x83,0x8f,0x70,0x20,0x00,0x05,0x00 }}, @@ -2795,7 +2795,7 @@ XGI_LVDSCRT1DataStruct XGI_CHTVCRT1OPAL[]= }; /*add for new UNIVGABIOS*/ -XGI330_LCDDataTablStruct XGI_LCDDataTable[]= +struct XGI330_LCDDataTablStruct XGI_LCDDataTable[] = { {Panel1024x768,0x0019,0x0001,0}, /* XGI_ExtLCD1024x768Data */ {Panel1024x768,0x0019,0x0000,1}, /* XGI_StLCD1024x768Data */ @@ -2819,7 +2819,7 @@ XGI330_LCDDataTablStruct XGI_LCDDataTable[]= {0xFF,0x0000,0x0000,0} /* End of table */ }; -XGI330_LCDDataTablStruct XGI_LCDDesDataTable[]= +struct XGI330_LCDDataTablStruct XGI_LCDDesDataTable[] = { {Panel1024x768,0x0019,0x0001,0}, /* XGI_ExtLCDDes1024x768Data */ {Panel1024x768,0x0019,0x0000,1}, /* XGI_StLCDDes1024x768Data */ @@ -2844,7 +2844,7 @@ XGI330_LCDDataTablStruct XGI_LCDDesDataTable[]= {0xFF,0x0000,0x0000,0} }; -XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_H[]= +struct XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_H[] = { {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDSCRT11024x768_1_H */ {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDSCRT11024x768_2_H */ @@ -2860,7 +2860,7 @@ XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_H[]= {0xFF,0x0000,0x0000,0} }; -XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_V[]= +struct XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_V[] = { {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDSCRT11024x768_1_V */ {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDSCRT11024x768_2_V */ @@ -2876,7 +2876,7 @@ XGI330_LCDDataTablStruct XGI_EPLLCDCRT1Ptr_V[]= {0xFF,0x0000,0x0000,0} }; -XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[]= +struct XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[] = { {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDS1024x768Data_1 */ {Panel1024x768,0x0018,0x0010,1}, /* XGI_LVDS1024x768Data_2 */ @@ -2894,7 +2894,7 @@ XGI330_LCDDataTablStruct XGI_EPLLCDDataPtr[]= {0xFF,0x0000,0x0000,0} }; -XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[]= +struct XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[] = { {Panel1024x768,0x0018,0x0000,0}, /* XGI_LVDS1024x768Des_1 */ {Panel1024x768,0x0618,0x0410,1}, /* XGI_LVDS1024x768Des_3 */ @@ -2914,14 +2914,14 @@ XGI330_LCDDataTablStruct XGI_EPLLCDDesDataPtr[]= {0xFF,0x0000,0x0000,0} }; -XGI330_LCDDataTablStruct XGI_EPLCHLCDRegPtr[]= +struct XGI330_LCDDataTablStruct XGI_EPLCHLCDRegPtr[] = { {Panel1024x768,0x0000,0x0000,0}, /* XGI_CH7017LV1024x768 */ {Panel1400x1050,0x0000,0x0000,1}, /* XGI_CH7017LV1400x1050 */ {0xFF,0x0000,0x0000,0} }; -XGI330_TVDataTablStruct XGI_TVDataTable[]= +struct XGI330_TVDataTablStruct XGI_TVDataTable[] = { {0x09E1,0x0001,0}, /* XGI_ExtPALData */ {0x09E1,0x0000,1}, /* XGI_ExtNTSCData */ @@ -2952,7 +2952,7 @@ unsigned short TVLenList[] = } ; /* Chrontel 7017 TV CRT1 Timing List */ -XGI330_TVDataTablStruct XGI_EPLCHTVCRT1Ptr[]= +struct XGI330_TVDataTablStruct XGI_EPLCHTVCRT1Ptr[] = { {0x0011,0x0000,0}, /* XGI_CHTVCRT1UNTSC */ {0x0011,0x0010,1}, /* XGI_CHTVCRT1ONTSC */ @@ -2962,7 +2962,7 @@ XGI330_TVDataTablStruct XGI_EPLCHTVCRT1Ptr[]= }; /* ;;Chrontel 7017 TV Timing List */ -XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[]= +struct XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[] = { {0x0011,0x0000,0}, /* XGI_CHTVUNTSCData */ {0x0011,0x0010,1}, /* XGI_CHTVONTSCData */ @@ -2972,7 +2972,7 @@ XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[]= }; /* ;;Chrontel 7017 TV Reg. List */ -XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[]= +struct XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[] = { {0x0011,0x0000,0}, /* XGI_CHTVRegUNTSC */ {0x0011,0x0010,1}, /* XGI_CHTVRegONTSC */ @@ -2995,7 +2995,7 @@ unsigned short LCDLenList[] = 0 } ; -XGI330_LCDCapStruct XGI660_LCDDLCapList[]= /* 660, Dual link */ +struct XGI330_LCDCapStruct XGI660_LCDDLCapList[] = /* 660, Dual link */ { /* LCDCap1024x768 */ {Panel1024x768, DefaultLCDCap, 0, 0x014, 0x88, 0x06, VCLK65, @@ -3027,7 +3027,7 @@ XGI330_LCDCapStruct XGI660_LCDDLCapList[]= /* 660, Dual link */ 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10} }; -XGI330_LCDCapStruct XGI_LCDDLCapList[]= /* Dual link only */ +struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = /* Dual link only */ { /* LCDCap1024x768 */ {Panel1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65, @@ -3059,7 +3059,7 @@ XGI330_LCDCapStruct XGI_LCDDLCapList[]= /* Dual link only */ 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10} }; -XGI330_LCDCapStruct XGI660_LCDCapList[]= +struct XGI330_LCDCapStruct XGI660_LCDCapList[] = { /* LCDCap1024x768 */ {Panel1024x768, DefaultLCDCap, 0, 0x014, 0x88, 0x06, VCLK65, @@ -3091,7 +3091,7 @@ XGI330_LCDCapStruct XGI660_LCDCapList[]= 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10} }; -XGI330_LCDCapStruct XGI_LCDCapList[]= +struct XGI330_LCDCapStruct XGI_LCDCapList[] = { /* LCDCap1024x768 */ {Panel1024x768, DefaultLCDCap, 0, 0x012, 0x88, 0x06, VCLK65, @@ -3123,7 +3123,7 @@ XGI330_LCDCapStruct XGI_LCDCapList[]= 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10} }; -XGI21_LVDSCapStruct XGI21_LCDCapList[]= +struct XGI21_LVDSCapStruct XGI21_LCDCapList[] = { {DisableLCD24bpp + LCDPolarity, 2160,1250,1600,1200, 64, 1, 192, 3, @@ -3152,7 +3152,7 @@ XGI21_LVDSCapStruct XGI21_LCDCapList[]= }; -XGI_Ext2Struct XGI330_RefIndex[]= +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 */ @@ -3231,7 +3231,7 @@ XGI_Ext2Struct XGI330_RefIndex[]= -XGI330_VCLKDataStruct XGI330_VCLKData[]= +struct XGI330_VCLKDataStruct XGI330_VCLKData[] = { { 0x1b,0xe1, 25}, /* 0x0 */ { 0x4e,0xe4, 28}, /* 0x1 */ @@ -3315,7 +3315,7 @@ XGI330_VCLKDataStruct XGI330_VCLKData[]= { 0x3b,0x61,108} /* 0x4f */ }; -XGI_VBVCLKDataStruct XGI330_VBVCLKData[]= +struct XGI_VBVCLKDataStruct XGI330_VBVCLKData[] = { { 0x1b,0xe1, 25}, /* 0x0 */ { 0x4e,0xe4, 28}, /* 0x1 */ @@ -3397,7 +3397,7 @@ unsigned char XGI330_ScreenOffset[] = { 0x14, 0x19, 0x20, 0x28, 0x32, 0x40, 0x50, 0x64, 0x78, 0x80, 0x2d, 0x35, 0x57, 0x48}; -XGI_StResInfoStruct XGI330_StResInfo[]= +struct XGI_StResInfoStruct XGI330_StResInfo[] = { { 640,400}, { 640,350}, @@ -3406,7 +3406,7 @@ XGI_StResInfoStruct XGI330_StResInfo[]= { 640,480} }; -XGI_ModeResInfoStruct XGI330_ModeResInfo[]= +struct XGI_ModeResInfoStruct XGI330_ModeResInfo[] = { { 320, 200, 8, 8}, { 320, 240, 8, 8}, @@ -3543,7 +3543,7 @@ unsigned char XGI7007_CHTVVCLKOPAL[] = {CH7007TVVCLK31_5, CH7007TVVCLK36 }; -XGI330_VCLKDataStruct XGI_CH7007VCLKData[]= +struct XGI330_VCLKDataStruct XGI_CH7007VCLKData[] = { { 0x60,0x36,30}, /* 0 30.2 MHZ */ { 0x40,0x4A,28}, /* 1 28.19 MHZ */ @@ -3558,7 +3558,7 @@ XGI330_VCLKDataStruct XGI_CH7007VCLKData[]= { 0xFF,0x00,0 } /* End mark */ }; -XGI330_VCLKDataStruct XGI_VCLKData[]= +struct XGI330_VCLKDataStruct XGI_VCLKData[] = { /* SR2B,SR2C,SR2D */ { 0x1B,0xE1,25 },/* 00 (25.175MHz) */ @@ -3759,7 +3759,7 @@ XGI330_VCLKDataStruct XGI_VCLKData[]= { 0xFF,0x00,0 }/* End mark */ } ; -XGI330_VCLKDataStruct XGI_VBVCLKData[]= +struct XGI330_VCLKDataStruct XGI_VBVCLKData[] = { { 0x1B,0xE1,25 },/* 00 (25.175MHz) */ @@ -4048,7 +4048,7 @@ unsigned char TVEdgeList[] = 0x00 /* ; 1 HiTV */ }; -unsigned long TVPhaseList[]= +unsigned long TVPhaseList[] = { 0x08BAED21, /* ; 0 NTSC phase */ 0x00E3052A, /* ; 1 PAL phase */ 0x9B2EE421, /* ; 2 PAL-M phase */ @@ -4166,7 +4166,7 @@ unsigned char XGI_NTSC1024AdjTime[] = 0x58,0xe4,0x73,0xd0,0x13 }; -XGI301C_Tap4TimingStruct HiTVTap4Timing[]= +struct XGI301C_Tap4TimingStruct HiTVTap4Timing[] = { {0,{ 0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */ @@ -4181,7 +4181,7 @@ XGI301C_Tap4TimingStruct HiTVTap4Timing[]= } }; -XGI301C_Tap4TimingStruct EnlargeTap4Timing[]= +struct XGI301C_Tap4TimingStruct EnlargeTap4Timing[] = { {0,{ 0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */ @@ -4196,7 +4196,7 @@ XGI301C_Tap4TimingStruct EnlargeTap4Timing[]= } }; -XGI301C_Tap4TimingStruct NoScaleTap4Timing[]= +struct XGI301C_Tap4TimingStruct NoScaleTap4Timing[] = { {0,{ 0x00,0x20,0x00,0x00,0x7F,0x20,0x02,0x7F, /* ; C0-C7 */ @@ -4211,7 +4211,7 @@ XGI301C_Tap4TimingStruct NoScaleTap4Timing[]= } }; -XGI301C_Tap4TimingStruct PALTap4Timing[]= +struct XGI301C_Tap4TimingStruct PALTap4Timing[] = { {600, { 0x05,0x19,0x05,0x7D,0x03,0x19,0x06,0x7E, /* ; C0-C7 */ @@ -4249,7 +4249,7 @@ XGI301C_Tap4TimingStruct PALTap4Timing[]= } }; -XGI301C_Tap4TimingStruct NTSCTap4Timing[]= +struct XGI301C_Tap4TimingStruct NTSCTap4Timing[] = { {480, { 0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */ @@ -4287,7 +4287,7 @@ XGI301C_Tap4TimingStruct NTSCTap4Timing[]= } }; -XGI301C_Tap4TimingStruct YPbPr525pTap4Timing[]= +struct XGI301C_Tap4TimingStruct YPbPr525pTap4Timing[] = { {480, { 0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */ @@ -4325,7 +4325,7 @@ XGI301C_Tap4TimingStruct YPbPr525pTap4Timing[]= } }; -XGI301C_Tap4TimingStruct YPbPr525iTap4Timing[]= +struct XGI301C_Tap4TimingStruct YPbPr525iTap4Timing[] = { {480, { 0x04,0x1A,0x04,0x7E,0x03,0x1A,0x06,0x7D, /* ; C0-C7 */ @@ -4363,7 +4363,7 @@ XGI301C_Tap4TimingStruct YPbPr525iTap4Timing[]= } }; -XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[]= +struct XGI301C_Tap4TimingStruct YPbPr750pTap4Timing[] = { {0xFFFF, { 0x05,0x19,0x05,0x7D,0x03,0x19,0x06,0x7E, /* ; C0-C7 */