diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2010-06-17 17:10:46 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 21:32:32 (GMT) |
commit | 82d6eb5b2ecd4ccdd44a23115fc499ecefc77706 (patch) | |
tree | 972f733c4b6b7095590cfe8bb9980eba51d7c3a8 /drivers/staging/xgifb/vb_struct.h | |
parent | 490ce818c6ff60257b543207aa042991e32017af (diff) | |
download | linux-82d6eb5b2ecd4ccdd44a23115fc499ecefc77706.tar.xz |
Staging: xgifb: Remove USHORT, ULONG, BOOLEAN, and VOID typedefs
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/vb_struct.h')
-rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 278 |
1 files changed, 139 insertions, 139 deletions
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 1ee619f..c0498d8 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -17,12 +17,12 @@ typedef struct _XGI_PanelDelayTblStruct typedef struct _XGI_LCDDataStruct { - USHORT RVBHCMAX; - USHORT RVBHCFACT; - USHORT VGAHT; - USHORT VGAVT; - USHORT LCDHT; - USHORT LCDVT; + unsigned short RVBHCMAX; + unsigned short RVBHCFACT; + unsigned short VGAHT; + unsigned short VGAVT; + unsigned short LCDHT; + unsigned short LCDVT; } XGI_LCDDataStruct; @@ -38,15 +38,15 @@ typedef struct _XGI_LVDSCRT1VDataStruct typedef struct _XGI_TVDataStruct { - USHORT RVBHCMAX; - USHORT RVBHCFACT; - USHORT VGAHT; - USHORT VGAVT; - USHORT TVHDE; - USHORT TVVDE; - USHORT RVBHRS; + unsigned short RVBHCMAX; + unsigned short RVBHCFACT; + unsigned short VGAHT; + unsigned short VGAVT; + unsigned short TVHDE; + unsigned short TVVDE; + unsigned short RVBHRS; UCHAR FlickerMode; - USHORT HALFRVBHRS; + unsigned short HALFRVBHRS; UCHAR RY1COE; UCHAR RY2COE; UCHAR RY3COE; @@ -55,16 +55,16 @@ typedef struct _XGI_TVDataStruct typedef struct _XGI_LVDSDataStruct { - USHORT VGAHT; - USHORT VGAVT; - USHORT LCDHT; - USHORT LCDVT; + unsigned short VGAHT; + unsigned short VGAVT; + unsigned short LCDHT; + unsigned short LCDVT; } XGI_LVDSDataStruct; typedef struct _XGI_LVDSDesStruct { - USHORT LCDHDES; - USHORT LCDVDES; + unsigned short LCDHDES; + unsigned short LCDVDES; } XGI_LVDSDesStruct; typedef struct _XGI_LVDSCRT1DataStruct @@ -78,7 +78,7 @@ typedef struct _XGI_LVDSCRT1DataStruct typedef struct _XGI_StStruct { UCHAR St_ModeID; - USHORT St_ModeFlag; + unsigned short St_ModeFlag; UCHAR St_StTableIndex; UCHAR St_CRT2CRTC; UCHAR St_CRT2CRTC2; @@ -93,7 +93,7 @@ typedef struct _XGI_StandTableStruct UCHAR CRT_COLS; UCHAR ROWS; UCHAR CHAR_HEIGHT; - USHORT CRT_LEN; + unsigned short CRT_LEN; UCHAR SR[4]; UCHAR MISC; UCHAR CRTC[0x19]; @@ -104,10 +104,10 @@ typedef struct _XGI_StandTableStruct typedef struct _XGI_ExtStruct { UCHAR Ext_ModeID; - USHORT Ext_ModeFlag; - USHORT Ext_ModeInfo; - USHORT Ext_Point; - USHORT Ext_VESAID; + unsigned short Ext_ModeFlag; + unsigned short Ext_ModeInfo; + unsigned short Ext_Point; + unsigned short Ext_VESAID; UCHAR Ext_VESAMEMSize; UCHAR Ext_RESINFO; UCHAR VB_ExtTVFlickerIndex; @@ -118,52 +118,52 @@ typedef struct _XGI_ExtStruct typedef struct _XGI_Ext2Struct { - USHORT Ext_InfoFlag; + unsigned short Ext_InfoFlag; UCHAR Ext_CRT1CRTC; UCHAR Ext_CRTVCLK; UCHAR Ext_CRT2CRTC; UCHAR Ext_CRT2CRTC2; UCHAR ModeID; - USHORT XRes; - USHORT YRes; - /* USHORT ROM_OFFSET; */ + unsigned short XRes; + unsigned short YRes; + /* unsigned short ROM_OFFSET; */ } XGI_Ext2Struct; typedef struct _XGI_MCLKDataStruct { UCHAR SR28,SR29,SR2A; - USHORT CLOCK; + unsigned short CLOCK; } XGI_MCLKDataStruct; typedef struct _XGI_ECLKDataStruct { UCHAR SR2E,SR2F,SR30; - USHORT CLOCK; + unsigned short CLOCK; } XGI_ECLKDataStruct; typedef struct _XGI_VCLKDataStruct { UCHAR SR2B,SR2C; - USHORT CLOCK; + unsigned short CLOCK; } XGI_VCLKDataStruct; typedef struct _XGI_VBVCLKDataStruct { UCHAR Part4_A,Part4_B; - USHORT CLOCK; + unsigned short CLOCK; } XGI_VBVCLKDataStruct; typedef struct _XGI_StResInfoStruct { - USHORT HTotal; - USHORT VTotal; + unsigned short HTotal; + unsigned short VTotal; } XGI_StResInfoStruct; typedef struct _XGI_ModeResInfoStruct { - USHORT HTotal; - USHORT VTotal; + unsigned short HTotal; + unsigned short VTotal; UCHAR XChar; UCHAR YChar; } XGI_ModeResInfoStruct; @@ -175,100 +175,100 @@ typedef struct _XGI_LCDNBDesStruct /*add for new UNIVGABIOS*/ typedef struct _XGI_LCDDesStruct { - USHORT LCDHDES; - USHORT LCDHRS; - USHORT LCDVDES; - USHORT LCDVRS; + unsigned short LCDHDES; + unsigned short LCDHRS; + unsigned short LCDVDES; + unsigned short LCDVRS; } XGI_LCDDesStruct; typedef struct _XGI_LCDDataTablStruct { UCHAR PANELID; - USHORT MASK; - USHORT CAP; - USHORT DATAPTR; + unsigned short MASK; + unsigned short CAP; + unsigned short DATAPTR; } XGI_LCDDataTablStruct; typedef struct _XGI_TVTablDataStruct { - USHORT MASK; - USHORT CAP; - USHORT DATAPTR; + unsigned short MASK; + unsigned short CAP; + unsigned short DATAPTR; } XGI_TVDataTablStruct; typedef struct _XGI330_LCDDesDataStruct { - USHORT LCDHDES; - USHORT LCDHRS; - USHORT LCDVDES; - USHORT LCDVRS; + unsigned short LCDHDES; + unsigned short LCDHRS; + unsigned short LCDVDES; + unsigned short LCDVRS; } XGI330_LCDDataDesStruct; typedef struct _XGI330_LVDSDataStruct { - USHORT VGAHT; - USHORT VGAVT; - USHORT LCDHT; - USHORT LCDVT; + unsigned short VGAHT; + unsigned short VGAVT; + unsigned short LCDHT; + unsigned short LCDVT; } XGI330_LVDSDataStruct; typedef struct _XGI330_LCDDesDataStruct2 { - USHORT LCDHDES; - USHORT LCDHRS; - USHORT LCDVDES; - USHORT LCDVRS; - USHORT LCDHSync; - USHORT LCDVSync; + unsigned short LCDHDES; + unsigned short LCDHRS; + unsigned short LCDVDES; + unsigned short LCDVRS; + unsigned short LCDHSync; + unsigned short LCDVSync; } XGI330_LCDDataDesStruct2; typedef struct _XGI330_LCDDataStruct { - USHORT RVBHCMAX; - USHORT RVBHCFACT; - USHORT VGAHT; - USHORT VGAVT; - USHORT LCDHT; - USHORT LCDVT; + unsigned short RVBHCMAX; + unsigned short RVBHCFACT; + unsigned short VGAHT; + unsigned short VGAVT; + unsigned short LCDHT; + unsigned short LCDVT; } XGI330_LCDDataStruct; typedef struct _XGI330_TVDataStruct { - USHORT RVBHCMAX; - USHORT RVBHCFACT; - USHORT VGAHT; - USHORT VGAVT; - USHORT TVHDE; - USHORT TVVDE; - USHORT RVBHRS; + unsigned short RVBHCMAX; + unsigned short RVBHCFACT; + unsigned short VGAHT; + unsigned short VGAVT; + unsigned short TVHDE; + unsigned short TVVDE; + unsigned short RVBHRS; UCHAR FlickerMode; - USHORT HALFRVBHRS; + unsigned short HALFRVBHRS; } XGI330_TVDataStruct; typedef struct _XGI330_LCDDataTablStruct { UCHAR PANELID; - USHORT MASK; - USHORT CAP; - USHORT DATAPTR; + unsigned short MASK; + unsigned short CAP; + unsigned short DATAPTR; } XGI330_LCDDataTablStruct; typedef struct _XGI330_TVDataTablStruct { - USHORT MASK; - USHORT CAP; - USHORT DATAPTR; + unsigned short MASK; + unsigned short CAP; + unsigned short DATAPTR; } XGI330_TVDataTablStruct; typedef struct _XGI330_CHTVDataStruct { - USHORT VGAHT; - USHORT VGAVT; - USHORT LCDHT; - USHORT LCDVT; + unsigned short VGAHT; + unsigned short VGAVT; + unsigned short LCDHT; + unsigned short LCDVT; } XGI330_CHTVDataStruct; typedef struct _XGI_TimingHStruct @@ -304,7 +304,7 @@ typedef struct _XGI330_CHTVRegDataStruct typedef struct _XGI330_LCDCapStruct { UCHAR LCD_ID; - USHORT LCD_Capability; + unsigned short LCD_Capability; UCHAR LCD_SetFlag; UCHAR LCD_DelayCompensation; UCHAR LCD_HSyncWidth; @@ -332,15 +332,15 @@ typedef struct _XGI330_LCDCapStruct typedef struct _XGI21_LVDSCapStruct { - USHORT LVDS_Capability; - USHORT LVDSHT; - USHORT LVDSVT; - USHORT LVDSHDE; - USHORT LVDSVDE; - USHORT LVDSHFP; - USHORT LVDSVFP; - USHORT LVDSHSYNC; - USHORT LVDSVSYNC; + 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; UCHAR VCLKData1; UCHAR VCLKData2; UCHAR PSC_S1; @@ -359,12 +359,12 @@ typedef struct _XGI_CRT1TableStruct typedef struct _XGI330_VCLKDataStruct { UCHAR SR2B,SR2C; - USHORT CLOCK; + unsigned short CLOCK; } XGI330_VCLKDataStruct; typedef struct _XGI301C_Tap4TimingStruct { - USHORT DE; + unsigned short DE; UCHAR Reg[64]; /* C0-FF */ } XGI301C_Tap4TimingStruct; @@ -373,7 +373,7 @@ typedef struct _XGI_New_StandTableStruct UCHAR CRT_COLS; UCHAR ROWS; UCHAR CHAR_HEIGHT; - USHORT CRT_LEN; + unsigned short CRT_LEN; UCHAR SR[4]; UCHAR MISC; UCHAR CRTC[0x19]; @@ -391,34 +391,34 @@ typedef VB_DEVICE_INFO * PVB_DEVICE_INFO; struct _VB_DEVICE_INFO { - BOOLEAN ISXPDOS; - ULONG P3c4,P3d4,P3c0,P3ce,P3c2,P3cc; - ULONG P3ca,P3c6,P3c7,P3c8,P3c9,P3da; - ULONG Part0Port,Part1Port,Part2Port; - ULONG Part3Port,Part4Port,Part5Port; - USHORT RVBHCFACT,RVBHCMAX,RVBHRS; - USHORT VGAVT,VGAHT,VGAVDE,VGAHDE; - USHORT VT,HT,VDE,HDE; - USHORT LCDHRS,LCDVRS,LCDHDES,LCDVDES; - - USHORT ModeType; - USHORT IF_DEF_LVDS,IF_DEF_TRUMPION,IF_DEF_DSTN;/* ,IF_DEF_FSTN; add for dstn */ - USHORT IF_DEF_CRT2Monitor,IF_DEF_VideoCapture; - USHORT IF_DEF_LCDA,IF_DEF_CH7017,IF_DEF_YPbPr,IF_DEF_ScaleLCD,IF_DEF_OEMUtil,IF_DEF_PWD; - USHORT IF_DEF_ExpLink; - USHORT IF_DEF_CH7005,IF_DEF_HiVision; - USHORT IF_DEF_CH7007; /* Billy 2007/05/03 */ - USHORT LCDResInfo,LCDTypeInfo, VBType;/*301b*/ - USHORT VBInfo,TVInfo,LCDInfo, Set_VGAType; - USHORT VBExtInfo;/*301lv*/ - USHORT SetFlag; - USHORT NewFlickerMode; - USHORT SelectCRT2Rate; + 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; - ULONG BaseAddr; - ULONG RelIO; + unsigned long BaseAddr; + unsigned long RelIO; DRAM4Type *CR6B; DRAM4Type *CR6E; @@ -430,12 +430,12 @@ struct _VB_DEVICE_INFO UCHAR *pSoftSetting; UCHAR *pOutputSelect; - USHORT *pRGBSenseData; - USHORT *pRGBSenseData2; /*301b*/ - USHORT *pVideoSenseData; - USHORT *pVideoSenseData2; - USHORT *pYCSenseData; - USHORT *pYCSenseData2; + unsigned short *pRGBSenseData; + unsigned short *pRGBSenseData2; /*301b*/ + unsigned short *pVideoSenseData; + unsigned short *pVideoSenseData2; + unsigned short *pYCSenseData; + unsigned short *pYCSenseData2; UCHAR *pSR07; UCHAR *CR49; @@ -516,18 +516,18 @@ struct _VB_DEVICE_INFO typedef struct { - USHORT Horizontal_ACTIVE; - USHORT Horizontal_FP; - USHORT Horizontal_SYNC; - USHORT Horizontal_BP; - USHORT Vertical_ACTIVE; - USHORT Vertical_FP; - USHORT Vertical_SYNC; - USHORT Vertical_BP; + 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; UCHAR FrameRate; UCHAR Interlace; - USHORT Margin; + unsigned short Margin; } TimingInfo; #define _VB_STRUCT_ |