1 files changed, 67 insertions, 75 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb_struct.h b/drivers/usb/misc/sisusbvga/sisusb_struct.h
index 9def598192c2..1c4240e802c1 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_struct.h
+++ b/drivers/usb/misc/sisusbvga/sisusb_struct.h
@@ -52,85 +52,78 @@
 #define _SISUSB_STRUCT_H_
 struct SiS_St {
-        unsigned char   St_ModeID;
+        unsigned char St_ModeID;
-        unsigned short  St_ModeFlag;
+        unsigned short St_ModeFlag;
-        unsigned char   St_StTableIndex;
+        unsigned char St_StTableIndex;
-        unsigned char   St_CRT2CRTC;
+        unsigned char St_CRT2CRTC;
-        unsigned char   St_ResInfo;
+        unsigned char St_ResInfo;
-        unsigned char   VB_StTVFlickerIndex;
+        unsigned char VB_StTVFlickerIndex;
-        unsigned char   VB_StTVEdgeIndex;
+        unsigned char VB_StTVEdgeIndex;
-        unsigned char   VB_StTVYFilterIndex;
+        unsigned char VB_StTVYFilterIndex;
-        unsigned char   St_PDC;
+        unsigned char St_PDC;
 };
-struct SiS_StandTable
+struct SiS_StandTable {
-{
+        unsigned char CRT_COLS;
-        unsigned char   CRT_COLS;
+        unsigned char ROWS;
-        unsigned char   ROWS;
+        unsigned char CHAR_HEIGHT;
-        unsigned char   CHAR_HEIGHT;
+        unsigned short CRT_LEN;
-        unsigned short  CRT_LEN;
+        unsigned char SR[4];
-        unsigned char   SR[4];
+        unsigned char MISC;
-        unsigned char   MISC;
+        unsigned char CRTC[0x19];
-        unsigned char   CRTC[0x19];
+        unsigned char ATTR[0x14];
-        unsigned char   ATTR[0x14];
+        unsigned char GRC[9];
-        unsigned char   GRC[9];
 };
 struct SiS_StResInfo_S {
-        unsigned short  HTotal;
+        unsigned short HTotal;
-        unsigned short  VTotal;
+        unsigned short VTotal;
 };
-struct SiS_Ext
+struct SiS_Ext {
-{
+        unsigned char Ext_ModeID;
-        unsigned char   Ext_ModeID;
+        unsigned short Ext_ModeFlag;
-        unsigned short  Ext_ModeFlag;
+        unsigned short Ext_VESAID;
-        unsigned short  Ext_VESAID;
+        unsigned char Ext_RESINFO;
-        unsigned char   Ext_RESINFO;
+        unsigned char VB_ExtTVFlickerIndex;
-        unsigned char   VB_ExtTVFlickerIndex;
+        unsigned char VB_ExtTVEdgeIndex;
-        unsigned char   VB_ExtTVEdgeIndex;
+        unsigned char VB_ExtTVYFilterIndex;
-        unsigned char   VB_ExtTVYFilterIndex;
+        unsigned char VB_ExtTVYFilterIndexROM661;
-        unsigned char   VB_ExtTVYFilterIndexROM661;
+        unsigned char REFindex;
-        unsigned char   REFindex;
+        char ROMMODEIDX661;
-        char            ROMMODEIDX661;
 };
-struct SiS_Ext2
+struct SiS_Ext2 {
-{
+        unsigned short Ext_InfoFlag;
-        unsigned short  Ext_InfoFlag;
+        unsigned char Ext_CRT1CRTC;
-        unsigned char   Ext_CRT1CRTC;
+        unsigned char Ext_CRTVCLK;
-        unsigned char   Ext_CRTVCLK;
+        unsigned char Ext_CRT2CRTC;
-        unsigned char   Ext_CRT2CRTC;
+        unsigned char Ext_CRT2CRTC_NS;
-        unsigned char   Ext_CRT2CRTC_NS;
+        unsigned char ModeID;
-        unsigned char   ModeID;
+        unsigned short XRes;
-        unsigned short  XRes;
+        unsigned short YRes;
-        unsigned short  YRes;
+        unsigned char Ext_PDC;
-        unsigned char   Ext_PDC;
+        unsigned char Ext_FakeCRT2CRTC;
-        unsigned char   Ext_FakeCRT2CRTC;
+        unsigned char Ext_FakeCRT2Clk;
-        unsigned char   Ext_FakeCRT2Clk;
 };
-struct SiS_CRT1Table
+struct SiS_CRT1Table {
-{
+        unsigned char CR[17];
-        unsigned char   CR[17];
 };
-struct SiS_VCLKData
+struct SiS_VCLKData {
-{
+        unsigned char SR2B, SR2C;
-        unsigned char   SR2B,SR2C;
+        unsigned short CLOCK;
-        unsigned short  CLOCK;
 };
-struct SiS_ModeResInfo
+struct SiS_ModeResInfo {
-{
+        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 SiS_Private
+struct SiS_Private {
-{
        void *sisusb;
        unsigned long IOAddress;
@@ -151,19 +144,18 @@ struct SiS_Private
        unsigned long SiS_P3da;
        unsigned long SiS_Part1Port;
-        unsigned char   SiS_MyCR63;
+        unsigned char SiS_MyCR63;
-        unsigned short  SiS_CRT1Mode;
+        unsigned short SiS_CRT1Mode;
-        unsigned short  SiS_ModeType;
+        unsigned short SiS_ModeType;
-        unsigned short  SiS_SetFlag;
+        unsigned short SiS_SetFlag;
-        const struct SiS_StandTable     *SiS_StandTable;
+        const struct SiS_StandTable *SiS_StandTable;
-        const struct SiS_St             *SiS_SModeIDTable;
+        const struct SiS_St *SiS_SModeIDTable;
-        const struct SiS_Ext            *SiS_EModeIDTable;
+        const struct SiS_Ext *SiS_EModeIDTable;
-        const struct SiS_Ext2           *SiS_RefIndex;
+        const struct SiS_Ext2 *SiS_RefIndex;
-        const struct SiS_CRT1Table      *SiS_CRT1Table;
+        const struct SiS_CRT1Table *SiS_CRT1Table;
-        const struct SiS_VCLKData       *SiS_VCLKData;
+        const struct SiS_VCLKData *SiS_VCLKData;
-        const struct SiS_ModeResInfo    *SiS_ModeResInfo;
+        const struct SiS_ModeResInfo *SiS_ModeResInfo;
 };
 #endif

diff --git a/drivers/usb/misc/sisusbvga/sisusb_struct.h b/drivers/usb/misc/sisusbvga/sisusb_struct.h index 9def598192c2..1c4240e802c1 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_struct.h +++ b/drivers/usb/misc/sisusbvga/sisusb_struct.h
@@ -52,85 +52,78 @@
52	#define _SISUSB_STRUCT_H_	52	#define _SISUSB_STRUCT_H_
53		53
54	struct SiS_St {	54	struct SiS_St {
55	unsigned char St_ModeID;	55	unsigned char St_ModeID;
56	unsigned short St_ModeFlag;	56	unsigned short St_ModeFlag;
57	unsigned char St_StTableIndex;	57	unsigned char St_StTableIndex;
58	unsigned char St_CRT2CRTC;	58	unsigned char St_CRT2CRTC;
59	unsigned char St_ResInfo;	59	unsigned char St_ResInfo;
60	unsigned char VB_StTVFlickerIndex;	60	unsigned char VB_StTVFlickerIndex;
61	unsigned char VB_StTVEdgeIndex;	61	unsigned char VB_StTVEdgeIndex;
62	unsigned char VB_StTVYFilterIndex;	62	unsigned char VB_StTVYFilterIndex;
63	unsigned char St_PDC;	63	unsigned char St_PDC;
64	};	64	};
65		65
66	struct SiS_StandTable	66	struct SiS_StandTable {
67	{	67	unsigned char CRT_COLS;
68	unsigned char CRT_COLS;	68	unsigned char ROWS;
69	unsigned char ROWS;	69	unsigned char CHAR_HEIGHT;
70	unsigned char CHAR_HEIGHT;	70	unsigned short CRT_LEN;
71	unsigned short CRT_LEN;	71	unsigned char SR[4];
72	unsigned char SR[4];	72	unsigned char MISC;
73	unsigned char MISC;	73	unsigned char CRTC[0x19];
74	unsigned char CRTC[0x19];	74	unsigned char ATTR[0x14];
75	unsigned char ATTR[0x14];	75	unsigned char GRC[9];
76	unsigned char GRC[9];
77	};	76	};
78		77
79	struct SiS_StResInfo_S {	78	struct SiS_StResInfo_S {
80	unsigned short HTotal;	79	unsigned short HTotal;
81	unsigned short VTotal;	80	unsigned short VTotal;
82	};	81	};
83		82
84	struct SiS_Ext	83	struct SiS_Ext {
85	{	84	unsigned char Ext_ModeID;
86	unsigned char Ext_ModeID;	85	unsigned short Ext_ModeFlag;
87	unsigned short Ext_ModeFlag;	86	unsigned short Ext_VESAID;
88	unsigned short Ext_VESAID;	87	unsigned char Ext_RESINFO;
89	unsigned char Ext_RESINFO;	88	unsigned char VB_ExtTVFlickerIndex;
90	unsigned char VB_ExtTVFlickerIndex;	89	unsigned char VB_ExtTVEdgeIndex;
91	unsigned char VB_ExtTVEdgeIndex;	90	unsigned char VB_ExtTVYFilterIndex;
92	unsigned char VB_ExtTVYFilterIndex;	91	unsigned char VB_ExtTVYFilterIndexROM661;
93	unsigned char VB_ExtTVYFilterIndexROM661;	92	unsigned char REFindex;
94	unsigned char REFindex;	93	char ROMMODEIDX661;
95	char ROMMODEIDX661;
96	};	94	};
97		95
98	struct SiS_Ext2	96	struct SiS_Ext2 {
99	{	97	unsigned short Ext_InfoFlag;
100	unsigned short Ext_InfoFlag;	98	unsigned char Ext_CRT1CRTC;
101	unsigned char Ext_CRT1CRTC;	99	unsigned char Ext_CRTVCLK;
102	unsigned char Ext_CRTVCLK;	100	unsigned char Ext_CRT2CRTC;
103	unsigned char Ext_CRT2CRTC;	101	unsigned char Ext_CRT2CRTC_NS;
104	unsigned char Ext_CRT2CRTC_NS;	102	unsigned char ModeID;
105	unsigned char ModeID;	103	unsigned short XRes;
106	unsigned short XRes;	104	unsigned short YRes;
107	unsigned short YRes;	105	unsigned char Ext_PDC;
108	unsigned char Ext_PDC;	106	unsigned char Ext_FakeCRT2CRTC;
109	unsigned char Ext_FakeCRT2CRTC;	107	unsigned char Ext_FakeCRT2Clk;
110	unsigned char Ext_FakeCRT2Clk;
111	};	108	};
112		109
113	struct SiS_CRT1Table	110	struct SiS_CRT1Table {
114	{	111	unsigned char CR[17];
115	unsigned char CR[17];
116	};	112	};
117		113
118	struct SiS_VCLKData	114	struct SiS_VCLKData {
119	{	115	unsigned char SR2B, SR2C;
120	unsigned char SR2B,SR2C;	116	unsigned short CLOCK;
121	unsigned short CLOCK;
122	};	117	};
123		118
124	struct SiS_ModeResInfo	119	struct SiS_ModeResInfo {
125	{	120	unsigned short HTotal;
126	unsigned short HTotal;	121	unsigned short VTotal;
127	unsigned short VTotal;	122	unsigned char XChar;
128	unsigned char XChar;	123	unsigned char YChar;
129	unsigned char YChar;
130	};	124	};
131		125
132	struct SiS_Private	126	struct SiS_Private {
133	{
134	void *sisusb;	127	void *sisusb;
135		128
136	unsigned long IOAddress;	129	unsigned long IOAddress;
@@ -151,19 +144,18 @@ struct SiS_Private
151	unsigned long SiS_P3da;	144	unsigned long SiS_P3da;
152	unsigned long SiS_Part1Port;	145	unsigned long SiS_Part1Port;
153		146
154	unsigned char SiS_MyCR63;	147	unsigned char SiS_MyCR63;
155	unsigned short SiS_CRT1Mode;	148	unsigned short SiS_CRT1Mode;
156	unsigned short SiS_ModeType;	149	unsigned short SiS_ModeType;
157	unsigned short SiS_SetFlag;	150	unsigned short SiS_SetFlag;
158		151
159	const struct SiS_StandTable *SiS_StandTable;	152	const struct SiS_StandTable *SiS_StandTable;
160	const struct SiS_St *SiS_SModeIDTable;	153	const struct SiS_St *SiS_SModeIDTable;
161	const struct SiS_Ext *SiS_EModeIDTable;	154	const struct SiS_Ext *SiS_EModeIDTable;
162	const struct SiS_Ext2 *SiS_RefIndex;	155	const struct SiS_Ext2 *SiS_RefIndex;
163	const struct SiS_CRT1Table *SiS_CRT1Table;	156	const struct SiS_CRT1Table *SiS_CRT1Table;
164	const struct SiS_VCLKData *SiS_VCLKData;	157	const struct SiS_VCLKData *SiS_VCLKData;
165	const struct SiS_ModeResInfo *SiS_ModeResInfo;	158	const struct SiS_ModeResInfo *SiS_ModeResInfo;
166	};	159	};
167		160
168	#endif	161	#endif
169