]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Staging: xgifb: Fixed almost all style warnings.
authorKenji Toyama <kenji.toyama@gmail.com>
Sat, 23 Apr 2011 13:54:07 +0000 (21:54 +0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 26 Apr 2011 00:30:42 +0000 (17:30 -0700)
I've removed all the warnings except one that I believe is a false
positive. The original author has used a macro to #define EXTERN to be
'extern', so in this case 'extern' is not used to define the storage
class of anything, but just the value of the macro. We can safely ignore
this warning.

Signed-off-by: Daniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/xgifb/vb_struct.h

index 9c6e0c7ac78126b7d68b0b64c7f7fb8f9dfa3df1..377d27c0c332f4faff64f5cbd944c48547044e3d 100644 (file)
 #define EXTERN extern
 #endif
 
+struct XGI_PanelDelayTblStruct {
+       unsigned char timer[2];
+};
 
+struct XGI_LCDDataStruct {
+       unsigned short RVBHCMAX;
+       unsigned short RVBHCFACT;
+       unsigned short VGAHT;
+       unsigned short VGAVT;
+       unsigned short LCDHT;
+       unsigned short LCDVT;
+};
 
 
-struct XGI_PanelDelayTblStruct
-{
- unsigned char timer[2];
+struct XGI_LVDSCRT1HDataStruct {
+       unsigned char Reg[8];
 };
 
-struct XGI_LCDDataStruct
-{
- unsigned short RVBHCMAX;
- unsigned short RVBHCFACT;
- unsigned short VGAHT;
- unsigned short VGAVT;
- unsigned short LCDHT;
- unsigned short LCDVT;
+struct XGI_LVDSCRT1VDataStruct {
+       unsigned char Reg[7];
 };
 
+struct XGI_TVDataStruct {
+       unsigned short RVBHCMAX;
+       unsigned short RVBHCFACT;
+       unsigned short VGAHT;
+       unsigned short VGAVT;
+       unsigned short TVHDE;
+       unsigned short TVVDE;
+       unsigned short RVBHRS;
+       unsigned char FlickerMode;
+       unsigned short HALFRVBHRS;
+       unsigned char RY1COE;
+       unsigned char RY2COE;
+       unsigned char RY3COE;
+       unsigned char RY4COE;
+};
 
-struct XGI_LVDSCRT1HDataStruct
-{
- unsigned char Reg[8];
+struct XGI_LVDSDataStruct {
+       unsigned short VGAHT;
+       unsigned short VGAVT;
+       unsigned short LCDHT;
+       unsigned short LCDVT;
 };
 
-struct XGI_LVDSCRT1VDataStruct
-{
unsigned char Reg[7];
+struct XGI_LVDSDesStruct {
+       unsigned short LCDHDES;
      unsigned short LCDVDES;
 };
 
+struct XGI_LVDSCRT1DataStruct {
+       unsigned char CR[15];
+};
 
-struct XGI_TVDataStruct
-{
- unsigned short RVBHCMAX;
- unsigned short RVBHCFACT;
- unsigned short VGAHT;
- unsigned short VGAVT;
- unsigned short TVHDE;
- unsigned short TVVDE;
- unsigned short RVBHRS;
- unsigned char FlickerMode;
- unsigned short HALFRVBHRS;
- unsigned char RY1COE;
- unsigned char RY2COE;
- unsigned char RY3COE;
- unsigned char RY4COE;
+/*add for LCDA*/
+
+struct XGI_StStruct {
+       unsigned char St_ModeID;
+       unsigned short St_ModeFlag;
+       unsigned char St_StTableIndex;
+       unsigned char St_CRT2CRTC;
+       unsigned char St_CRT2CRTC2;
+       unsigned char St_ResInfo;
+       unsigned char VB_StTVFlickerIndex;
+       unsigned char VB_StTVEdgeIndex;
+       unsigned char VB_StTVYFilterIndex;
+};
+
+struct XGI_StandTableStruct {
+       unsigned char CRT_COLS;
+       unsigned char ROWS;
+       unsigned char CHAR_HEIGHT;
+       unsigned short CRT_LEN;
+       unsigned char SR[4];
+       unsigned char MISC;
+       unsigned char CRTC[0x19];
+       unsigned char ATTR[0x14];
+       unsigned char GRC[9];
 };
 
-struct XGI_LVDSDataStruct
-{
- unsigned short VGAHT;
- unsigned short VGAVT;
- unsigned short LCDHT;
- unsigned short LCDVT;
+struct XGI_ExtStruct {
+       unsigned char Ext_ModeID;
+       unsigned short Ext_ModeFlag;
+       unsigned short Ext_ModeInfo;
+       unsigned short Ext_Point;
+       unsigned short Ext_VESAID;
+       unsigned char Ext_VESAMEMSize;
+       unsigned char Ext_RESINFO;
+       unsigned char VB_ExtTVFlickerIndex;
+       unsigned char VB_ExtTVEdgeIndex;
+       unsigned char VB_ExtTVYFilterIndex;
+       unsigned char REFindex;
 };
 
-struct XGI_LVDSDesStruct
-{
- unsigned short LCDHDES;
- unsigned short LCDVDES;
+struct XGI_Ext2Struct {
+       unsigned short Ext_InfoFlag;
+       unsigned char Ext_CRT1CRTC;
+       unsigned char Ext_CRTVCLK;
+       unsigned char Ext_CRT2CRTC;
+       unsigned char Ext_CRT2CRTC2;
+       unsigned char  ModeID;
+       unsigned short XRes;
+       unsigned short YRes;
+       /* unsigned short ROM_OFFSET; */
 };
 
-struct XGI_LVDSCRT1DataStruct
-{
- unsigned char CR[15];
+
+struct XGI_MCLKDataStruct {
+       unsigned char SR28, SR29, SR2A;
+       unsigned short CLOCK;
 };
 
-/*add for LCDA*/
+struct XGI_ECLKDataStruct {
+       unsigned char SR2E, SR2F, SR30;
+       unsigned short CLOCK;
+};
+
+struct XGI_VCLKDataStruct {
+       unsigned char SR2B, SR2C;
+       unsigned short CLOCK;
+};
 
-struct XGI_StStruct
-{
- unsigned char St_ModeID;
- unsigned short St_ModeFlag;
- unsigned char St_StTableIndex;
- unsigned char St_CRT2CRTC;
- unsigned char St_CRT2CRTC2;
- unsigned char St_ResInfo;
- unsigned char VB_StTVFlickerIndex;
- unsigned char VB_StTVEdgeIndex;
- unsigned char VB_StTVYFilterIndex;
-};
-
-struct XGI_StandTableStruct
-{
- unsigned char CRT_COLS;
- unsigned char ROWS;
- unsigned char CHAR_HEIGHT;
- unsigned short CRT_LEN;
- unsigned char SR[4];
- unsigned char MISC;
- unsigned char CRTC[0x19];
- unsigned char ATTR[0x14];
- unsigned char GRC[9];
-};
-
-struct XGI_ExtStruct
-{
- unsigned char Ext_ModeID;
- unsigned short Ext_ModeFlag;
- unsigned short Ext_ModeInfo;
- unsigned short Ext_Point;
- unsigned short Ext_VESAID;
- unsigned char Ext_VESAMEMSize;
- unsigned char Ext_RESINFO;
- unsigned char VB_ExtTVFlickerIndex;
- unsigned char VB_ExtTVEdgeIndex;
- unsigned char VB_ExtTVYFilterIndex;
- unsigned char REFindex;
-};
-
-struct XGI_Ext2Struct
-{
- unsigned short Ext_InfoFlag;
- unsigned char Ext_CRT1CRTC;
- unsigned char Ext_CRTVCLK;
- unsigned char Ext_CRT2CRTC;
- unsigned char Ext_CRT2CRTC2;
- unsigned char  ModeID;
- unsigned short XRes;
- unsigned short YRes;
- /* unsigned short ROM_OFFSET; */
-};
-
-
-struct XGI_MCLKDataStruct
-{
- unsigned char SR28, SR29, SR2A;
- unsigned short CLOCK;
-};
-
-struct XGI_ECLKDataStruct
-{
- unsigned char SR2E, SR2F, SR30;
- unsigned short CLOCK;
-};
-
-struct XGI_VCLKDataStruct
-{
- unsigned char SR2B, SR2C;
- unsigned short CLOCK;
-};
-
-struct XGI_VBVCLKDataStruct
-{
- unsigned char Part4_A, Part4_B;
- unsigned short CLOCK;
-};
-
-struct XGI_StResInfoStruct
-{
- unsigned short HTotal;
- unsigned short VTotal;
-};
-
-struct XGI_ModeResInfoStruct
-{
- unsigned short HTotal;
- unsigned short VTotal;
- unsigned char  XChar;
- unsigned char  YChar;
-};
-
-struct XGI_LCDNBDesStruct
-{
-  unsigned char NB[12];
-};
- /*add for new UNIVGABIOS*/
-struct XGI_LCDDesStruct
-{
- unsigned short LCDHDES;
- unsigned short LCDHRS;
- unsigned short LCDVDES;
- unsigned short LCDVRS;
+struct XGI_VBVCLKDataStruct {
+       unsigned char Part4_A, Part4_B;
+       unsigned short CLOCK;
 };
 
-struct XGI_LCDDataTablStruct
-{
- unsigned char  PANELID;
- unsigned short MASK;
- unsigned short CAP;
- unsigned short DATAPTR;
+struct XGI_StResInfoStruct {
+       unsigned short HTotal;
+       unsigned short VTotal;
 };
 
-struct XGI_TVTablDataStruct
-{
unsigned short MASK;
unsigned short CAP;
unsigned short DATAPTR;
+struct XGI_ModeResInfoStruct {
+       unsigned short HTotal;
      unsigned short VTotal;
      unsigned char  XChar;
      unsigned char  YChar;
 };
 
-struct XGI330_LCDDataDesStruct
-{
- unsigned short LCDHDES;
- unsigned short LCDHRS;
- unsigned short LCDVDES;
- unsigned short LCDVRS;
+struct XGI_LCDNBDesStruct {
+       unsigned char NB[12];
 };
 
+/*add for new UNIVGABIOS*/
+struct XGI_LCDDesStruct {
+       unsigned short LCDHDES;
+       unsigned short LCDHRS;
+       unsigned short LCDVDES;
+       unsigned short LCDVRS;
+};
 
-struct XGI330_LVDSDataStruct
-{
- unsigned short VGAHT;
- unsigned short VGAVT;
- unsigned short LCDHT;
- unsigned short LCDVT;
+struct XGI_LCDDataTablStruct {
+       unsigned char  PANELID;
+       unsigned short MASK;
+       unsigned short CAP;
+       unsigned short DATAPTR;
 };
 
-struct XGI330_LCDDataDesStruct2
-{
- unsigned short LCDHDES;
- unsigned short LCDHRS;
- unsigned short LCDVDES;
- unsigned short LCDVRS;
- unsigned short LCDHSync;
- unsigned short LCDVSync;
+struct XGI_TVTablDataStruct {
+       unsigned short MASK;
+       unsigned short CAP;
+       unsigned short DATAPTR;
 };
 
-struct XGI330_LCDDataStruct
-{
- unsigned short RVBHCMAX;
- unsigned short RVBHCFACT;
- unsigned short VGAHT;
- unsigned short VGAVT;
- unsigned short LCDHT;
- unsigned short LCDVT;
+struct XGI330_LCDDataDesStruct {
+       unsigned short LCDHDES;
+       unsigned short LCDHRS;
+       unsigned short LCDVDES;
+       unsigned short LCDVRS;
 };
 
 
-struct XGI330_TVDataStruct
-{
- unsigned short RVBHCMAX;
- unsigned short RVBHCFACT;
- unsigned short VGAHT;
- unsigned short VGAVT;
- unsigned short TVHDE;
- unsigned short TVVDE;
- unsigned short RVBHRS;
- unsigned char FlickerMode;
- unsigned short HALFRVBHRS;
-};
-
-struct XGI330_LCDDataTablStruct
-{
- unsigned char  PANELID;
- unsigned short MASK;
- unsigned short CAP;
- unsigned short DATAPTR;
-};
-
-struct XGI330_TVDataTablStruct
-{
- unsigned short MASK;
- unsigned short CAP;
- unsigned short DATAPTR;
-};
-
-
-struct XGI330_CHTVDataStruct
-{
- unsigned short VGAHT;
- unsigned short VGAVT;
- unsigned short LCDHT;
- unsigned short LCDVT;
-};
-
-struct XGI_TimingHStruct
-{
-  unsigned char data[8];
-};
+struct XGI330_LVDSDataStruct {
+       unsigned short VGAHT;
+       unsigned short VGAVT;
+       unsigned short LCDHT;
+       unsigned short LCDVT;
+};
 
-struct XGI_TimingVStruct
-{
-  unsigned char data[7];
+struct XGI330_LCDDataDesStruct2 {
+       unsigned short LCDHDES;
+       unsigned short LCDHRS;
+       unsigned short LCDVDES;
+       unsigned short LCDVRS;
+       unsigned short LCDHSync;
+       unsigned short LCDVSync;
 };
 
-struct XGI_CH7007TV_TimingHStruct
-{
-  unsigned char data[10];
+struct XGI330_LCDDataStruct {
+       unsigned short RVBHCMAX;
+       unsigned short RVBHCFACT;
+       unsigned short VGAHT;
+       unsigned short VGAVT;
+       unsigned short LCDHT;
+       unsigned short LCDVT;
 };
 
-struct XGI_CH7007TV_TimingVStruct
-{
-  unsigned char data[10];
-};
-
-struct XGI_XG21CRT1Struct
-{
- unsigned char ModeID, CR02, CR03, CR15, CR16;
+
+struct XGI330_TVDataStruct {
+       unsigned short RVBHCMAX;
+       unsigned short RVBHCFACT;
+       unsigned short VGAHT;
+       unsigned short VGAVT;
+       unsigned short TVHDE;
+       unsigned short TVVDE;
+       unsigned short RVBHRS;
+       unsigned char FlickerMode;
+       unsigned short HALFRVBHRS;
 };
 
-struct XGI330_CHTVRegDataStruct
-{
- unsigned char Reg[16];
+struct XGI330_LCDDataTablStruct {
+       unsigned char  PANELID;
+       unsigned short MASK;
+       unsigned short CAP;
+       unsigned short DATAPTR;
 };
 
-struct XGI330_LCDCapStruct
-{
-               unsigned char      LCD_ID;
-               unsigned short     LCD_Capability;
-               unsigned char      LCD_SetFlag;
-               unsigned char      LCD_DelayCompensation;
-               unsigned char      LCD_HSyncWidth;
-               unsigned char      LCD_VSyncWidth;
-               unsigned char      LCD_VCLK;
-               unsigned char      LCDA_VCLKData1;
-               unsigned char      LCDA_VCLKData2;
-               unsigned char      LCUCHAR_VCLKData1;
-               unsigned char      LCUCHAR_VCLKData2;
-               unsigned char      PSC_S1;
-               unsigned char      PSC_S2;
-               unsigned char      PSC_S3;
-               unsigned char      PSC_S4;
-               unsigned char      PSC_S5;
-               unsigned char      PWD_2B;
-               unsigned char      PWD_2C;
-               unsigned char      PWD_2D;
-               unsigned char      PWD_2E;
-               unsigned char      PWD_2F;
-               unsigned char      Spectrum_31;
-               unsigned char      Spectrum_32;
-               unsigned char      Spectrum_33;
-               unsigned char      Spectrum_34;
+struct XGI330_TVDataTablStruct {
+       unsigned short MASK;
+       unsigned short CAP;
+       unsigned short DATAPTR;
 };
 
-struct XGI21_LVDSCapStruct
-{
-               unsigned short     LVDS_Capability;
-               unsigned short     LVDSHT;
-               unsigned short     LVDSVT;
-               unsigned short     LVDSHDE;
-               unsigned short     LVDSVDE;
-               unsigned short     LVDSHFP;
-               unsigned short     LVDSVFP;
-               unsigned short     LVDSHSYNC;
-               unsigned short     LVDSVSYNC;
-               unsigned char      VCLKData1;
-               unsigned char      VCLKData2;
-               unsigned char      PSC_S1;
-               unsigned char      PSC_S2;
-               unsigned char      PSC_S3;
-               unsigned char      PSC_S4;
-               unsigned char      PSC_S5;
+
+struct XGI330_CHTVDataStruct {
+       unsigned short VGAHT;
+       unsigned short VGAVT;
+       unsigned short LCDHT;
+       unsigned short LCDVT;
 };
 
-struct XGI_CRT1TableStruct
-{
-  unsigned char CR[16];
+struct XGI_TimingHStruct {
+       unsigned char data[8];
 };
 
+struct XGI_TimingVStruct {
+       unsigned char data[7];
+};
 
-struct XGI330_VCLKDataStruct
-{
-    unsigned char SR2B, SR2C;
-    unsigned short CLOCK;
+struct XGI_CH7007TV_TimingHStruct {
+       unsigned char data[10];
 };
 
-struct XGI301C_Tap4TimingStruct
-{
-    unsigned short DE;
-    unsigned char  Reg[64];   /* C0-FF */
-};
+struct XGI_CH7007TV_TimingVStruct {
+       unsigned char data[10];
+};
+
+struct XGI_XG21CRT1Struct {
+       unsigned char ModeID, CR02, CR03, CR15, CR16;
+};
+
+struct XGI330_CHTVRegDataStruct {
+       unsigned char Reg[16];
+};
+
+struct XGI330_LCDCapStruct {
+       unsigned char   LCD_ID;
+       unsigned short  LCD_Capability;
+       unsigned char   LCD_SetFlag;
+       unsigned char   LCD_DelayCompensation;
+       unsigned char   LCD_HSyncWidth;
+       unsigned char   LCD_VSyncWidth;
+       unsigned char   LCD_VCLK;
+       unsigned char   LCDA_VCLKData1;
+       unsigned char   LCDA_VCLKData2;
+       unsigned char   LCUCHAR_VCLKData1;
+       unsigned char   LCUCHAR_VCLKData2;
+       unsigned char   PSC_S1;
+       unsigned char   PSC_S2;
+       unsigned char   PSC_S3;
+       unsigned char   PSC_S4;
+       unsigned char   PSC_S5;
+       unsigned char   PWD_2B;
+       unsigned char   PWD_2C;
+       unsigned char   PWD_2D;
+       unsigned char   PWD_2E;
+       unsigned char   PWD_2F;
+       unsigned char   Spectrum_31;
+       unsigned char   Spectrum_32;
+       unsigned char   Spectrum_33;
+       unsigned char   Spectrum_34;
+};
+
+struct XGI21_LVDSCapStruct {
+       unsigned short LVDS_Capability;
+       unsigned short LVDSHT;
+       unsigned short LVDSVT;
+       unsigned short LVDSHDE;
+       unsigned short LVDSVDE;
+       unsigned short LVDSHFP;
+       unsigned short LVDSVFP;
+       unsigned short LVDSHSYNC;
+       unsigned short LVDSVSYNC;
+       unsigned char  VCLKData1;
+       unsigned char  VCLKData2;
+       unsigned char  PSC_S1;
+       unsigned char  PSC_S2;
+       unsigned char  PSC_S3;
+       unsigned char  PSC_S4;
+       unsigned char  PSC_S5;
+};
+
+struct XGI_CRT1TableStruct {
+       unsigned char CR[16];
+};
+
+
+struct XGI330_VCLKDataStruct {
+       unsigned char SR2B, SR2C;
+       unsigned short CLOCK;
+};
+
+struct XGI301C_Tap4TimingStruct {
+       unsigned short DE;
+       unsigned char  Reg[64];   /* C0-FF */
+};
 
-struct XGI_New_StandTableStruct
-{
+struct XGI_New_StandTableStruct {
        unsigned char  CRT_COLS;
        unsigned char  ROWS;
        unsigned char  CHAR_HEIGHT;
@@ -381,36 +336,37 @@ struct XGI_New_StandTableStruct
        unsigned char  GRC[9];
 };
 
-struct vb_device_info
-{
-    unsigned char  ISXPDOS;
-    unsigned long   P3c4,P3d4,P3c0,P3ce,P3c2,P3cc;
-    unsigned long   P3ca,P3c6,P3c7,P3c8,P3c9,P3da;
-    unsigned long   Part0Port,Part1Port,Part2Port;
-    unsigned long   Part3Port,Part4Port,Part5Port;
-    unsigned short   RVBHCFACT,RVBHCMAX,RVBHRS;
-    unsigned short   VGAVT,VGAHT,VGAVDE,VGAHDE;
-    unsigned short   VT,HT,VDE,HDE;
-    unsigned short   LCDHRS,LCDVRS,LCDHDES,LCDVDES;
-
-    unsigned short   ModeType;
-    unsigned short   IF_DEF_LVDS,IF_DEF_TRUMPION,IF_DEF_DSTN;/* ,IF_DEF_FSTN; add for dstn */
-    unsigned short   IF_DEF_CRT2Monitor,IF_DEF_VideoCapture;
-    unsigned short   IF_DEF_LCDA,IF_DEF_CH7017,IF_DEF_YPbPr,IF_DEF_ScaleLCD,IF_DEF_OEMUtil,IF_DEF_PWD;
-    unsigned short   IF_DEF_ExpLink;
-    unsigned short   IF_DEF_CH7005,IF_DEF_HiVision;
-    unsigned short   IF_DEF_CH7007; /* Billy 2007/05/03 */
-    unsigned short   LCDResInfo,LCDTypeInfo, VBType;/*301b*/
-    unsigned short   VBInfo,TVInfo,LCDInfo, Set_VGAType;
-    unsigned short   VBExtInfo;/*301lv*/
-    unsigned short   SetFlag;
-    unsigned short   NewFlickerMode;
-    unsigned short   SelectCRT2Rate;
-
-    unsigned char *ROMAddr;
-    unsigned char *FBAddr;
-    unsigned long BaseAddr;
-    unsigned long RelIO;
+struct vb_device_info {
+       unsigned char  ISXPDOS;
+       unsigned long   P3c4, P3d4, P3c0, P3ce, P3c2, P3cc;
+       unsigned long   P3ca, P3c6, P3c7, P3c8, P3c9, P3da;
+       unsigned long   Part0Port, Part1Port, Part2Port;
+       unsigned long   Part3Port, Part4Port, Part5Port;
+       unsigned short   RVBHCFACT, RVBHCMAX, RVBHRS;
+       unsigned short   VGAVT, VGAHT, VGAVDE, VGAHDE;
+       unsigned short   VT, HT, VDE, HDE;
+       unsigned short   LCDHRS, LCDVRS, LCDHDES, LCDVDES;
+
+       unsigned short   ModeType;
+       /* ,IF_DEF_FSTN; add for dstn */
+       unsigned short   IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;
+       unsigned short   IF_DEF_CRT2Monitor, IF_DEF_VideoCapture;
+       unsigned short   IF_DEF_LCDA, IF_DEF_CH7017, IF_DEF_YPbPr,
+                        IF_DEF_ScaleLCD, IF_DEF_OEMUtil, IF_DEF_PWD;
+       unsigned short   IF_DEF_ExpLink;
+       unsigned short   IF_DEF_CH7005, IF_DEF_HiVision;
+       unsigned short   IF_DEF_CH7007; /* Billy 2007/05/03 */
+       unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/
+       unsigned short   VBInfo, TVInfo, LCDInfo, Set_VGAType;
+       unsigned short   VBExtInfo;/*301lv*/
+       unsigned short   SetFlag;
+       unsigned short   NewFlickerMode;
+       unsigned short   SelectCRT2Rate;
+
+       unsigned char *ROMAddr;
+       unsigned char *FBAddr;
+       unsigned long BaseAddr;
+       unsigned long RelIO;
 
        unsigned char (*CR6B)[4];
        unsigned char (*CR6E)[4];
@@ -420,107 +376,106 @@ struct vb_device_info
        unsigned char (*SR15)[8];
        unsigned char (*CR40)[8];
 
-    unsigned char  *pSoftSetting;
-    unsigned char  *pOutputSelect;
-
-    unsigned short *pRGBSenseData;
-    unsigned short *pRGBSenseData2; /*301b*/
-    unsigned short *pVideoSenseData;
-    unsigned short *pVideoSenseData2;
-    unsigned short *pYCSenseData;
-    unsigned short *pYCSenseData2;
-
-    unsigned char  *pSR07;
-    unsigned char  *CR49;
-    unsigned char  *pSR1F;
-    unsigned char  *AGPReg;
-    unsigned char  *SR16;
-    unsigned char  *pSR21;
-    unsigned char  *pSR22;
-    unsigned char  *pSR23;
-    unsigned char  *pSR24;
-    unsigned char  *SR25;
-    unsigned char  *pSR31;
-    unsigned char  *pSR32;
-    unsigned char  *pSR33;
-    unsigned char  *pSR36;      /* alan 12/07/2006 */
-    unsigned char  *pCRCF;
-    unsigned char  *pCRD0;      /* alan 12/07/2006 */
-    unsigned char  *pCRDE;      /* alan 12/07/2006 */
-    unsigned char  *pCR8F;      /* alan 12/07/2006 */
-    unsigned char  *pSR40;      /* alan 12/07/2006 */
-    unsigned char  *pSR41;      /* alan 12/07/2006 */
-    unsigned char  *pDVOSetting;
-    unsigned char  *pCR2E;
-    unsigned char  *pCR2F;
-    unsigned char  *pCR46;
-    unsigned char  *pCR47;
-    unsigned char  *pCRT2Data_1_2;
-    unsigned char  *pCRT2Data_4_D;
-    unsigned char  *pCRT2Data_4_E;
-    unsigned char  *pCRT2Data_4_10;
-    struct XGI_MCLKDataStruct  *MCLKData;
-    struct XGI_ECLKDataStruct  *ECLKData;
-
-    unsigned char   *XGI_TVDelayList;
-    unsigned char   *XGI_TVDelayList2;
-    unsigned char   *CHTVVCLKUNTSC;
-    unsigned char   *CHTVVCLKONTSC;
-    unsigned char   *CHTVVCLKUPAL;
-    unsigned char   *CHTVVCLKOPAL;
-    unsigned char   *NTSCTiming;
-    unsigned char   *PALTiming;
-    unsigned char   *HiTVExtTiming;
-    unsigned char   *HiTVSt1Timing;
-    unsigned char   *HiTVSt2Timing;
-    unsigned char   *HiTVTextTiming;
-    unsigned char   *YPbPr750pTiming;
-    unsigned char   *YPbPr525pTiming;
-    unsigned char   *YPbPr525iTiming;
-    unsigned char   *HiTVGroup3Data;
-    unsigned char   *HiTVGroup3Simu;
-    unsigned char   *HiTVGroup3Text;
-    unsigned char   *Ren525pGroup3;
-    unsigned char   *Ren750pGroup3;
-    unsigned char   *ScreenOffset;
-    unsigned char   *pXGINew_DRAMTypeDefinition;
-    unsigned char   *pXGINew_I2CDefinition ;
-    unsigned char   *pXGINew_CR97 ;
-
-    struct XGI330_LCDCapStruct  *LCDCapList;
-    struct XGI21_LVDSCapStruct  *XG21_LVDSCapList;
-
-    struct XGI_TimingHStruct  *TimingH;
-    struct XGI_TimingVStruct  *TimingV;
-
-    struct XGI_StStruct          *SModeIDTable;
-    struct XGI_StandTableStruct  *StandTable;
-    struct XGI_ExtStruct         *EModeIDTable;
-    struct XGI_Ext2Struct        *RefIndex;
-    /* XGINew_CRT1TableStruct *CRT1Table; */
-    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;
+       unsigned char  *pSoftSetting;
+       unsigned char  *pOutputSelect;
+
+       unsigned short *pRGBSenseData;
+       unsigned short *pRGBSenseData2; /*301b*/
+       unsigned short *pVideoSenseData;
+       unsigned short *pVideoSenseData2;
+       unsigned short *pYCSenseData;
+       unsigned short *pYCSenseData2;
+
+       unsigned char  *pSR07;
+       unsigned char  *CR49;
+       unsigned char  *pSR1F;
+       unsigned char  *AGPReg;
+       unsigned char  *SR16;
+       unsigned char  *pSR21;
+       unsigned char  *pSR22;
+       unsigned char  *pSR23;
+       unsigned char  *pSR24;
+       unsigned char  *SR25;
+       unsigned char  *pSR31;
+       unsigned char  *pSR32;
+       unsigned char  *pSR33;
+       unsigned char  *pSR36;      /* alan 12/07/2006 */
+       unsigned char  *pCRCF;
+       unsigned char  *pCRD0;      /* alan 12/07/2006 */
+       unsigned char  *pCRDE;      /* alan 12/07/2006 */
+       unsigned char  *pCR8F;      /* alan 12/07/2006 */
+       unsigned char  *pSR40;      /* alan 12/07/2006 */
+       unsigned char  *pSR41;      /* alan 12/07/2006 */
+       unsigned char  *pDVOSetting;
+       unsigned char  *pCR2E;
+       unsigned char  *pCR2F;
+       unsigned char  *pCR46;
+       unsigned char  *pCR47;
+       unsigned char  *pCRT2Data_1_2;
+       unsigned char  *pCRT2Data_4_D;
+       unsigned char  *pCRT2Data_4_E;
+       unsigned char  *pCRT2Data_4_10;
+       struct XGI_MCLKDataStruct  *MCLKData;
+       struct XGI_ECLKDataStruct  *ECLKData;
+
+       unsigned char   *XGI_TVDelayList;
+       unsigned char   *XGI_TVDelayList2;
+       unsigned char   *CHTVVCLKUNTSC;
+       unsigned char   *CHTVVCLKONTSC;
+       unsigned char   *CHTVVCLKUPAL;
+       unsigned char   *CHTVVCLKOPAL;
+       unsigned char   *NTSCTiming;
+       unsigned char   *PALTiming;
+       unsigned char   *HiTVExtTiming;
+       unsigned char   *HiTVSt1Timing;
+       unsigned char   *HiTVSt2Timing;
+       unsigned char   *HiTVTextTiming;
+       unsigned char   *YPbPr750pTiming;
+       unsigned char   *YPbPr525pTiming;
+       unsigned char   *YPbPr525iTiming;
+       unsigned char   *HiTVGroup3Data;
+       unsigned char   *HiTVGroup3Simu;
+       unsigned char   *HiTVGroup3Text;
+       unsigned char   *Ren525pGroup3;
+       unsigned char   *Ren750pGroup3;
+       unsigned char   *ScreenOffset;
+       unsigned char   *pXGINew_DRAMTypeDefinition;
+       unsigned char   *pXGINew_I2CDefinition ;
+       unsigned char   *pXGINew_CR97 ;
+
+       struct XGI330_LCDCapStruct  *LCDCapList;
+       struct XGI21_LVDSCapStruct  *XG21_LVDSCapList;
+
+       struct XGI_TimingHStruct  *TimingH;
+       struct XGI_TimingVStruct  *TimingV;
+
+       struct XGI_StStruct          *SModeIDTable;
+       struct XGI_StandTableStruct  *StandTable;
+       struct XGI_ExtStruct         *EModeIDTable;
+       struct XGI_Ext2Struct        *RefIndex;
+       /* XGINew_CRT1TableStruct *CRT1Table; */
+       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 */
 
 
-struct TimingInfo
-{
-    unsigned short    Horizontal_ACTIVE;
-    unsigned short    Horizontal_FP;
-    unsigned short    Horizontal_SYNC;
-    unsigned short    Horizontal_BP;
-    unsigned short    Vertical_ACTIVE;
-    unsigned short    Vertical_FP;
-    unsigned short    Vertical_SYNC;
-    unsigned short    Vertical_BP;
-    double    DCLK;
-    unsigned char     FrameRate;
-    unsigned char     Interlace;
-    unsigned short    Margin;
+struct TimingInfo {
+       unsigned short Horizontal_ACTIVE;
+       unsigned short Horizontal_FP;
+       unsigned short Horizontal_SYNC;
+       unsigned short Horizontal_BP;
+       unsigned short Vertical_ACTIVE;
+       unsigned short Vertical_FP;
+       unsigned short Vertical_SYNC;
+       unsigned short Vertical_BP;
+       double         DCLK;
+       unsigned char  FrameRate;
+       unsigned char  Interlace;
+       unsigned short Margin;
 };
 
 #define _VB_STRUCT_