Skip to content

L
linux
Commit 918122e6 authored by Kenji Toyama's avatar Kenji Toyama Committed by Greg Kroah-Hartman
Browse files
Options

Staging: xgifb: Fixed almost all style warnings. 

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: default avatarDaniel Kenji Toyama <kenji.toyama@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1d7f656d
Show whitespace changes
Inline Side-by-side
Showing with 389 additions and 434 deletions
drivers/staging/xgifb/vb_struct.h
View file @ 918122e6
...@@ -7,16 +7,11 @@ ...@@ -7,16 +7,11 @@
#define EXTERN extern #define EXTERN extern
#endif #endif
struct XGI_PanelDelayTblStruct {
struct XGI_PanelDelayTblStruct
{
unsigned char timer[2]; unsigned char timer[2];
}; };
struct XGI_LCDDataStruct struct XGI_LCDDataStruct {
{
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
unsigned short RVBHCFACT; unsigned short RVBHCFACT;
unsigned short VGAHT; unsigned short VGAHT;
...@@ -26,19 +21,15 @@ struct XGI_LCDDataStruct ...@@ -26,19 +21,15 @@ struct XGI_LCDDataStruct
}; };
struct XGI_LVDSCRT1HDataStruct struct XGI_LVDSCRT1HDataStruct {
{
unsigned char Reg[8]; unsigned char Reg[8];
}; };
struct XGI_LVDSCRT1VDataStruct struct XGI_LVDSCRT1VDataStruct {
{
unsigned char Reg[7]; unsigned char Reg[7];
}; };
struct XGI_TVDataStruct {
struct XGI_TVDataStruct
{
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
unsigned short RVBHCFACT; unsigned short RVBHCFACT;
unsigned short VGAHT; unsigned short VGAHT;
...@@ -54,29 +45,25 @@ struct XGI_TVDataStruct ...@@ -54,29 +45,25 @@ struct XGI_TVDataStruct
unsigned char RY4COE; unsigned char RY4COE;
}; };
struct XGI_LVDSDataStruct struct XGI_LVDSDataStruct {
{
unsigned short VGAHT; unsigned short VGAHT;
unsigned short VGAVT; unsigned short VGAVT;
unsigned short LCDHT; unsigned short LCDHT;
unsigned short LCDVT; unsigned short LCDVT;
}; };
struct XGI_LVDSDesStruct struct XGI_LVDSDesStruct {
{
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDVDES; unsigned short LCDVDES;
}; };
struct XGI_LVDSCRT1DataStruct struct XGI_LVDSCRT1DataStruct {
{
unsigned char CR[15]; unsigned char CR[15];
}; };
/*add for LCDA*/ /*add for LCDA*/
struct XGI_StStruct struct XGI_StStruct {
{
unsigned char St_ModeID; unsigned char St_ModeID;
unsigned short St_ModeFlag; unsigned short St_ModeFlag;
unsigned char St_StTableIndex; unsigned char St_StTableIndex;
...@@ -88,8 +75,7 @@ struct XGI_StStruct ...@@ -88,8 +75,7 @@ struct XGI_StStruct
unsigned char VB_StTVYFilterIndex; unsigned char VB_StTVYFilterIndex;
}; };
struct XGI_StandTableStruct struct XGI_StandTableStruct {
{
unsigned char CRT_COLS; unsigned char CRT_COLS;
unsigned char ROWS; unsigned char ROWS;
unsigned char CHAR_HEIGHT; unsigned char CHAR_HEIGHT;
...@@ -101,8 +87,7 @@ struct XGI_StandTableStruct ...@@ -101,8 +87,7 @@ struct XGI_StandTableStruct
unsigned char GRC[9]; unsigned char GRC[9];
}; };
struct XGI_ExtStruct struct XGI_ExtStruct {
{
unsigned char Ext_ModeID; unsigned char Ext_ModeID;
unsigned short Ext_ModeFlag; unsigned short Ext_ModeFlag;
unsigned short Ext_ModeInfo; unsigned short Ext_ModeInfo;
...@@ -116,8 +101,7 @@ struct XGI_ExtStruct ...@@ -116,8 +101,7 @@ struct XGI_ExtStruct
unsigned char REFindex; unsigned char REFindex;
}; };
struct XGI_Ext2Struct struct XGI_Ext2Struct {
{
unsigned short Ext_InfoFlag; unsigned short Ext_InfoFlag;
unsigned char Ext_CRT1CRTC; unsigned char Ext_CRT1CRTC;
unsigned char Ext_CRTVCLK; unsigned char Ext_CRTVCLK;
...@@ -130,74 +114,64 @@ struct XGI_Ext2Struct ...@@ -130,74 +114,64 @@ struct XGI_Ext2Struct
}; };
struct XGI_MCLKDataStruct struct XGI_MCLKDataStruct {
{
unsigned char SR28, SR29, SR2A; unsigned char SR28, SR29, SR2A;
unsigned short CLOCK; unsigned short CLOCK;
}; };
struct XGI_ECLKDataStruct struct XGI_ECLKDataStruct {
{
unsigned char SR2E, SR2F, SR30; unsigned char SR2E, SR2F, SR30;
unsigned short CLOCK; unsigned short CLOCK;
}; };
struct XGI_VCLKDataStruct struct XGI_VCLKDataStruct {
{
unsigned char SR2B, SR2C; unsigned char SR2B, SR2C;
unsigned short CLOCK; unsigned short CLOCK;
}; };
struct XGI_VBVCLKDataStruct struct XGI_VBVCLKDataStruct {
{
unsigned char Part4_A, Part4_B; unsigned char Part4_A, Part4_B;
unsigned short CLOCK; unsigned short CLOCK;
}; };
struct XGI_StResInfoStruct struct XGI_StResInfoStruct {
{
unsigned short HTotal; unsigned short HTotal;
unsigned short VTotal; unsigned short VTotal;
}; };
struct XGI_ModeResInfoStruct struct XGI_ModeResInfoStruct {
{
unsigned short HTotal; unsigned short HTotal;
unsigned short VTotal; unsigned short VTotal;
unsigned char XChar; unsigned char XChar;
unsigned char YChar; unsigned char YChar;
}; };
struct XGI_LCDNBDesStruct struct XGI_LCDNBDesStruct {
{
unsigned char NB[12]; unsigned char NB[12];
}; };
/*add for new UNIVGABIOS*/
struct XGI_LCDDesStruct /*add for new UNIVGABIOS*/
{ struct XGI_LCDDesStruct {
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDHRS; unsigned short LCDHRS;
unsigned short LCDVDES; unsigned short LCDVDES;
unsigned short LCDVRS; unsigned short LCDVRS;
}; };
struct XGI_LCDDataTablStruct struct XGI_LCDDataTablStruct {
{
unsigned char PANELID; unsigned char PANELID;
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
unsigned short DATAPTR; unsigned short DATAPTR;
}; };
struct XGI_TVTablDataStruct struct XGI_TVTablDataStruct {
{
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
unsigned short DATAPTR; unsigned short DATAPTR;
}; };
struct XGI330_LCDDataDesStruct struct XGI330_LCDDataDesStruct {
{
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDHRS; unsigned short LCDHRS;
unsigned short LCDVDES; unsigned short LCDVDES;
...@@ -205,16 +179,14 @@ struct XGI330_LCDDataDesStruct ...@@ -205,16 +179,14 @@ struct XGI330_LCDDataDesStruct
}; };
struct XGI330_LVDSDataStruct struct XGI330_LVDSDataStruct {
{
unsigned short VGAHT; unsigned short VGAHT;
unsigned short VGAVT; unsigned short VGAVT;
unsigned short LCDHT; unsigned short LCDHT;
unsigned short LCDVT; unsigned short LCDVT;
}; };
struct XGI330_LCDDataDesStruct2 struct XGI330_LCDDataDesStruct2 {
{
unsigned short LCDHDES; unsigned short LCDHDES;
unsigned short LCDHRS; unsigned short LCDHRS;
unsigned short LCDVDES; unsigned short LCDVDES;
...@@ -223,8 +195,7 @@ struct XGI330_LCDDataDesStruct2 ...@@ -223,8 +195,7 @@ struct XGI330_LCDDataDesStruct2
unsigned short LCDVSync; unsigned short LCDVSync;
}; };
struct XGI330_LCDDataStruct struct XGI330_LCDDataStruct {
{
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
unsigned short RVBHCFACT; unsigned short RVBHCFACT;
unsigned short VGAHT; unsigned short VGAHT;
...@@ -234,8 +205,7 @@ struct XGI330_LCDDataStruct ...@@ -234,8 +205,7 @@ struct XGI330_LCDDataStruct
}; };
struct XGI330_TVDataStruct struct XGI330_TVDataStruct {
{
unsigned short RVBHCMAX; unsigned short RVBHCMAX;
unsigned short RVBHCFACT; unsigned short RVBHCFACT;
unsigned short VGAHT; unsigned short VGAHT;
...@@ -247,62 +217,52 @@ struct XGI330_TVDataStruct ...@@ -247,62 +217,52 @@ struct XGI330_TVDataStruct
unsigned short HALFRVBHRS; unsigned short HALFRVBHRS;
}; };
struct XGI330_LCDDataTablStruct struct XGI330_LCDDataTablStruct {
{
unsigned char PANELID; unsigned char PANELID;
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
unsigned short DATAPTR; unsigned short DATAPTR;
}; };
struct XGI330_TVDataTablStruct struct XGI330_TVDataTablStruct {
{
unsigned short MASK; unsigned short MASK;
unsigned short CAP; unsigned short CAP;
unsigned short DATAPTR; unsigned short DATAPTR;
}; };
struct XGI330_CHTVDataStruct struct XGI330_CHTVDataStruct {
{
unsigned short VGAHT; unsigned short VGAHT;
unsigned short VGAVT; unsigned short VGAVT;
unsigned short LCDHT; unsigned short LCDHT;
unsigned short LCDVT; unsigned short LCDVT;
}; };
struct XGI_TimingHStruct struct XGI_TimingHStruct {
{
unsigned char data[8]; unsigned char data[8];
}; };
struct XGI_TimingVStruct struct XGI_TimingVStruct {
{
unsigned char data[7]; unsigned char data[7];
}; };
struct XGI_CH7007TV_TimingHStruct struct XGI_CH7007TV_TimingHStruct {
{
unsigned char data[10]; unsigned char data[10];
}; };
struct XGI_CH7007TV_TimingVStruct struct XGI_CH7007TV_TimingVStruct {
{
unsigned char data[10]; unsigned char data[10];
}; };
struct XGI_XG21CRT1Struct struct XGI_XG21CRT1Struct {
{
unsigned char ModeID, CR02, CR03, CR15, CR16; unsigned char ModeID, CR02, CR03, CR15, CR16;
}; };
struct XGI330_CHTVRegDataStruct struct XGI330_CHTVRegDataStruct {
{
unsigned char Reg[16]; unsigned char Reg[16];
}; };
struct XGI330_LCDCapStruct struct XGI330_LCDCapStruct {
{
unsigned char LCD_ID; unsigned char LCD_ID;
unsigned short LCD_Capability; unsigned short LCD_Capability;
unsigned char LCD_SetFlag; unsigned char LCD_SetFlag;
...@@ -330,8 +290,7 @@ struct XGI330_LCDCapStruct ...@@ -330,8 +290,7 @@ struct XGI330_LCDCapStruct
unsigned char Spectrum_34; unsigned char Spectrum_34;
}; };
struct XGI21_LVDSCapStruct struct XGI21_LVDSCapStruct {
{
unsigned short LVDS_Capability; unsigned short LVDS_Capability;
unsigned short LVDSHT; unsigned short LVDSHT;
unsigned short LVDSVT; unsigned short LVDSVT;
...@@ -350,26 +309,22 @@ struct XGI21_LVDSCapStruct ...@@ -350,26 +309,22 @@ struct XGI21_LVDSCapStruct
unsigned char PSC_S5; unsigned char PSC_S5;
}; };
struct XGI_CRT1TableStruct struct XGI_CRT1TableStruct {
{
unsigned char CR[16]; unsigned char CR[16];
}; };
struct XGI330_VCLKDataStruct struct XGI330_VCLKDataStruct {
{
unsigned char SR2B, SR2C; unsigned char SR2B, SR2C;
unsigned short CLOCK; unsigned short CLOCK;
}; };
struct XGI301C_Tap4TimingStruct struct XGI301C_Tap4TimingStruct {
{
unsigned short DE; unsigned short DE;
unsigned char Reg[64]; /* C0-FF */ unsigned char Reg[64]; /* C0-FF */
}; };
struct XGI_New_StandTableStruct struct XGI_New_StandTableStruct {
{
unsigned char CRT_COLS; unsigned char CRT_COLS;
unsigned char ROWS; unsigned char ROWS;
unsigned char CHAR_HEIGHT; unsigned char CHAR_HEIGHT;
...@@ -381,27 +336,28 @@ struct XGI_New_StandTableStruct ...@@ -381,27 +336,28 @@ struct XGI_New_StandTableStruct
unsigned char GRC[9]; unsigned char GRC[9];
}; };
struct vb_device_info struct vb_device_info {
{
unsigned char ISXPDOS; unsigned char ISXPDOS;
unsigned long P3c4,P3d4,P3c0,P3ce,P3c2,P3cc; unsigned long P3c4, P3d4, P3c0, P3ce, P3c2, P3cc;
unsigned long P3ca,P3c6,P3c7,P3c8,P3c9,P3da; unsigned long P3ca, P3c6, P3c7, P3c8, P3c9, P3da;
unsigned long Part0Port,Part1Port,Part2Port; unsigned long Part0Port, Part1Port, Part2Port;
unsigned long Part3Port,Part4Port,Part5Port; unsigned long Part3Port, Part4Port, Part5Port;
unsigned short RVBHCFACT,RVBHCMAX,RVBHRS; unsigned short RVBHCFACT, RVBHCMAX, RVBHRS;
unsigned short VGAVT,VGAHT,VGAVDE,VGAHDE; unsigned short VGAVT, VGAHT, VGAVDE, VGAHDE;
unsigned short VT,HT,VDE,HDE; unsigned short VT, HT, VDE, HDE;
unsigned short LCDHRS,LCDVRS,LCDHDES,LCDVDES; unsigned short LCDHRS, LCDVRS, LCDHDES, LCDVDES;
unsigned short ModeType; unsigned short ModeType;
unsigned short IF_DEF_LVDS,IF_DEF_TRUMPION,IF_DEF_DSTN;/* ,IF_DEF_FSTN; add for dstn */ /* ,IF_DEF_FSTN; add for dstn */
unsigned short IF_DEF_CRT2Monitor,IF_DEF_VideoCapture; unsigned short IF_DEF_LVDS, IF_DEF_TRUMPION, IF_DEF_DSTN;
unsigned short IF_DEF_LCDA,IF_DEF_CH7017,IF_DEF_YPbPr,IF_DEF_ScaleLCD,IF_DEF_OEMUtil,IF_DEF_PWD; 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_ExpLink;
unsigned short IF_DEF_CH7005,IF_DEF_HiVision; unsigned short IF_DEF_CH7005, IF_DEF_HiVision;
unsigned short IF_DEF_CH7007; /* Billy 2007/05/03 */ unsigned short IF_DEF_CH7007; /* Billy 2007/05/03 */
unsigned short LCDResInfo,LCDTypeInfo, VBType;/*301b*/ unsigned short LCDResInfo, LCDTypeInfo, VBType;/*301b*/
unsigned short VBInfo,TVInfo,LCDInfo, Set_VGAType; unsigned short VBInfo, TVInfo, LCDInfo, Set_VGAType;
unsigned short VBExtInfo;/*301lv*/ unsigned short VBExtInfo;/*301lv*/
unsigned short SetFlag; unsigned short SetFlag;
unsigned short NewFlickerMode; unsigned short NewFlickerMode;
...@@ -507,8 +463,7 @@ struct vb_device_info ...@@ -507,8 +463,7 @@ struct vb_device_info
}; /* _struct vb_device_info */ }; /* _struct vb_device_info */
struct TimingInfo struct TimingInfo {
{
unsigned short Horizontal_ACTIVE; unsigned short Horizontal_ACTIVE;
unsigned short Horizontal_FP; unsigned short Horizontal_FP;
unsigned short Horizontal_SYNC; unsigned short Horizontal_SYNC;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7