diff options
author | Ruslan Pisarev <ruslan@rpisarev.org.ua> | 2010-03-15 08:24:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 14:35:46 -0400 |
commit | cebb7e83361aba7ff05ec5cfb1bd1d5c8d983eed (patch) | |
tree | 298a1792d812bcfc9e538795f7dd037b14f538ba /drivers/staging/wavelan/i82586.h | |
parent | 7c327857016116eba1595c67c25d0314d1385e85 (diff) |
Staging: wavelan: fix spaces and TAB coding style issue in i82586.h
This is a patch to the i82586.h file that fixed up a TAB and
spaces Errors found by the checkpatch.pl tools, like
ERROR: spaces required around that '=' (ctx:VxV)
and
ERROR: space required before the open brace '{'
Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wavelan/i82586.h')
-rw-r--r-- | drivers/staging/wavelan/i82586.h | 58 |
1 files changed, 21 insertions, 37 deletions
diff --git a/drivers/staging/wavelan/i82586.h b/drivers/staging/wavelan/i82586.h index 5f65b250646..27f83249813 100644 --- a/drivers/staging/wavelan/i82586.h +++ b/drivers/staging/wavelan/i82586.h | |||
@@ -30,14 +30,13 @@ | |||
30 | #define ADDR_LEN 6 | 30 | #define ADDR_LEN 6 |
31 | #define I82586NULL 0xFFFF | 31 | #define I82586NULL 0xFFFF |
32 | 32 | ||
33 | #define toff(t,p,f) (unsigned short)((void *)(&((t *)((void *)0 + (p)))->f) - (void *)0) | 33 | #define toff(t, p, f) (unsigned short)((void *)(&((t *)((void *)0 + (p)))->f) - (void *)0) |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * System Configuration Pointer (SCP). | 36 | * System Configuration Pointer (SCP). |
37 | */ | 37 | */ |
38 | typedef struct scp_t scp_t; | 38 | typedef struct scp_t scp_t; |
39 | struct scp_t | 39 | struct scp_t { |
40 | { | ||
41 | unsigned short scp_sysbus; /* 82586 bus width: */ | 40 | unsigned short scp_sysbus; /* 82586 bus width: */ |
42 | #define SCP_SY_16BBUS (0x0 << 0) /* 16 bits */ | 41 | #define SCP_SY_16BBUS (0x0 << 0) /* 16 bits */ |
43 | #define SCP_SY_8BBUS (0x1 << 0) /* 8 bits. */ | 42 | #define SCP_SY_8BBUS (0x1 << 0) /* 8 bits. */ |
@@ -50,8 +49,7 @@ struct scp_t | |||
50 | * Intermediate System Configuration Pointer (ISCP). | 49 | * Intermediate System Configuration Pointer (ISCP). |
51 | */ | 50 | */ |
52 | typedef struct iscp_t iscp_t; | 51 | typedef struct iscp_t iscp_t; |
53 | struct iscp_t | 52 | struct iscp_t { |
54 | { | ||
55 | unsigned short iscp_busy; /* set by CPU before first CA, */ | 53 | unsigned short iscp_busy; /* set by CPU before first CA, */ |
56 | /* cleared by 82586 after read. */ | 54 | /* cleared by 82586 after read. */ |
57 | unsigned short iscp_offset; /* offset of SCB */ | 55 | unsigned short iscp_offset; /* offset of SCB */ |
@@ -67,8 +65,7 @@ struct iscp_t | |||
67 | * then issues a Channel Attention (CA) to alert the 82586. | 65 | * then issues a Channel Attention (CA) to alert the 82586. |
68 | */ | 66 | */ |
69 | typedef struct scb_t scb_t; | 67 | typedef struct scb_t scb_t; |
70 | struct scb_t | 68 | struct scb_t { |
71 | { | ||
72 | unsigned short scb_status; /* Status of 82586 */ | 69 | unsigned short scb_status; /* Status of 82586 */ |
73 | #define SCB_ST_INT (0xF << 12) /* Some of: */ | 70 | #define SCB_ST_INT (0xF << 12) /* Some of: */ |
74 | #define SCB_ST_CX (0x1 << 15) /* Cmd completed */ | 71 | #define SCB_ST_CX (0x1 << 15) /* Cmd completed */ |
@@ -118,14 +115,13 @@ struct scb_t | |||
118 | unsigned short scb_ovrnerrs; /* Frames lost due to slow bus */ | 115 | unsigned short scb_ovrnerrs; /* Frames lost due to slow bus */ |
119 | }; | 116 | }; |
120 | 117 | ||
121 | #define scboff(p,f) toff(scb_t, p, f) | 118 | #define scboff(p, f) toff(scb_t, p, f) |
122 | 119 | ||
123 | /* | 120 | /* |
124 | * The eight Action Commands. | 121 | * The eight Action Commands. |
125 | */ | 122 | */ |
126 | typedef enum acmd_e acmd_e; | 123 | typedef enum acmd_e acmd_e; |
127 | enum acmd_e | 124 | enum acmd_e { |
128 | { | ||
129 | acmd_nop = 0, /* Do nothing */ | 125 | acmd_nop = 0, /* Do nothing */ |
130 | acmd_ia_setup = 1, /* Load an (ethernet) address into the */ | 126 | acmd_ia_setup = 1, /* Load an (ethernet) address into the */ |
131 | /* 82586 */ | 127 | /* 82586 */ |
@@ -143,8 +139,7 @@ enum acmd_e | |||
143 | * Generic Action Command header. | 139 | * Generic Action Command header. |
144 | */ | 140 | */ |
145 | typedef struct ach_t ach_t; | 141 | typedef struct ach_t ach_t; |
146 | struct ach_t | 142 | struct ach_t { |
147 | { | ||
148 | unsigned short ac_status; /* Command status: */ | 143 | unsigned short ac_status; /* Command status: */ |
149 | #define AC_SFLD_C (0x1 << 15) /* Command completed */ | 144 | #define AC_SFLD_C (0x1 << 15) /* Command completed */ |
150 | #define AC_SFLD_B (0x1 << 14) /* Busy executing */ | 145 | #define AC_SFLD_B (0x1 << 14) /* Busy executing */ |
@@ -172,14 +167,13 @@ struct ach_t | |||
172 | unsigned short ac_link; /* Next Action Command */ | 167 | unsigned short ac_link; /* Next Action Command */ |
173 | }; | 168 | }; |
174 | 169 | ||
175 | #define acoff(p,f) toff(ach_t, p, f) | 170 | #define acoff(p, f) toff(ach_t, p, f) |
176 | 171 | ||
177 | /* | 172 | /* |
178 | * The Nop Action Command. | 173 | * The Nop Action Command. |
179 | */ | 174 | */ |
180 | typedef struct ac_nop_t ac_nop_t; | 175 | typedef struct ac_nop_t ac_nop_t; |
181 | struct ac_nop_t | 176 | struct ac_nop_t { |
182 | { | ||
183 | ach_t nop_h; | 177 | ach_t nop_h; |
184 | }; | 178 | }; |
185 | 179 | ||
@@ -187,8 +181,7 @@ struct ac_nop_t | |||
187 | * The IA-Setup Action Command. | 181 | * The IA-Setup Action Command. |
188 | */ | 182 | */ |
189 | typedef struct ac_ias_t ac_ias_t; | 183 | typedef struct ac_ias_t ac_ias_t; |
190 | struct ac_ias_t | 184 | struct ac_ias_t { |
191 | { | ||
192 | ach_t ias_h; | 185 | ach_t ias_h; |
193 | unsigned char ias_addr[ADDR_LEN]; /* The (ethernet) address */ | 186 | unsigned char ias_addr[ADDR_LEN]; /* The (ethernet) address */ |
194 | }; | 187 | }; |
@@ -197,8 +190,7 @@ struct ac_ias_t | |||
197 | * The Configure Action Command. | 190 | * The Configure Action Command. |
198 | */ | 191 | */ |
199 | typedef struct ac_cfg_t ac_cfg_t; | 192 | typedef struct ac_cfg_t ac_cfg_t; |
200 | struct ac_cfg_t | 193 | struct ac_cfg_t { |
201 | { | ||
202 | ach_t cfg_h; | 194 | ach_t cfg_h; |
203 | unsigned char cfg_byte_cnt; /* Size foll data: 4-12 */ | 195 | unsigned char cfg_byte_cnt; /* Size foll data: 4-12 */ |
204 | #define AC_CFG_BYTE_CNT(v) (((v) & 0xF) << 0) | 196 | #define AC_CFG_BYTE_CNT(v) (((v) & 0xF) << 0) |
@@ -255,8 +247,7 @@ struct ac_cfg_t | |||
255 | * The MC-Setup Action Command. | 247 | * The MC-Setup Action Command. |
256 | */ | 248 | */ |
257 | typedef struct ac_mcs_t ac_mcs_t; | 249 | typedef struct ac_mcs_t ac_mcs_t; |
258 | struct ac_mcs_t | 250 | struct ac_mcs_t { |
259 | { | ||
260 | ach_t mcs_h; | 251 | ach_t mcs_h; |
261 | unsigned short mcs_cnt; /* No. of bytes of MC addresses */ | 252 | unsigned short mcs_cnt; /* No. of bytes of MC addresses */ |
262 | #if 0 | 253 | #if 0 |
@@ -271,8 +262,7 @@ struct ac_mcs_t | |||
271 | * The Transmit Action Command. | 262 | * The Transmit Action Command. |
272 | */ | 263 | */ |
273 | typedef struct ac_tx_t ac_tx_t; | 264 | typedef struct ac_tx_t ac_tx_t; |
274 | struct ac_tx_t | 265 | struct ac_tx_t { |
275 | { | ||
276 | ach_t tx_h; | 266 | ach_t tx_h; |
277 | unsigned short tx_tbd_offset; /* Address of list of buffers. */ | 267 | unsigned short tx_tbd_offset; /* Address of list of buffers. */ |
278 | #if 0 | 268 | #if 0 |
@@ -290,8 +280,7 @@ ac_cfg_t action command. | |||
290 | * The Time Domain Reflectometer Action Command. | 280 | * The Time Domain Reflectometer Action Command. |
291 | */ | 281 | */ |
292 | typedef struct ac_tdr_t ac_tdr_t; | 282 | typedef struct ac_tdr_t ac_tdr_t; |
293 | struct ac_tdr_t | 283 | struct ac_tdr_t { |
294 | { | ||
295 | ach_t tdr_h; | 284 | ach_t tdr_h; |
296 | unsigned short tdr_result; /* Result. */ | 285 | unsigned short tdr_result; /* Result. */ |
297 | #define AC_TDR_LNK_OK (0x1 << 15) /* No link problem */ | 286 | #define AC_TDR_LNK_OK (0x1 << 15) /* No link problem */ |
@@ -307,8 +296,7 @@ struct ac_tdr_t | |||
307 | * The Dump Action Command. | 296 | * The Dump Action Command. |
308 | */ | 297 | */ |
309 | typedef struct ac_dmp_t ac_dmp_t; | 298 | typedef struct ac_dmp_t ac_dmp_t; |
310 | struct ac_dmp_t | 299 | struct ac_dmp_t { |
311 | { | ||
312 | ach_t dmp_h; | 300 | ach_t dmp_h; |
313 | unsigned short dmp_offset; /* Result. */ | 301 | unsigned short dmp_offset; /* Result. */ |
314 | }; | 302 | }; |
@@ -322,8 +310,7 @@ struct ac_dmp_t | |||
322 | * The Diagnose Action Command. | 310 | * The Diagnose Action Command. |
323 | */ | 311 | */ |
324 | typedef struct ac_dgn_t ac_dgn_t; | 312 | typedef struct ac_dgn_t ac_dgn_t; |
325 | struct ac_dgn_t | 313 | struct ac_dgn_t { |
326 | { | ||
327 | ach_t dgn_h; | 314 | ach_t dgn_h; |
328 | }; | 315 | }; |
329 | 316 | ||
@@ -331,8 +318,7 @@ struct ac_dgn_t | |||
331 | * Transmit Buffer Descriptor (TBD). | 318 | * Transmit Buffer Descriptor (TBD). |
332 | */ | 319 | */ |
333 | typedef struct tbd_t tbd_t; | 320 | typedef struct tbd_t tbd_t; |
334 | struct tbd_t | 321 | struct tbd_t { |
335 | { | ||
336 | unsigned short tbd_status; /* Written by the CPU */ | 322 | unsigned short tbd_status; /* Written by the CPU */ |
337 | #define TBD_STATUS_EOF (0x1 << 15) /* This TBD is the */ | 323 | #define TBD_STATUS_EOF (0x1 << 15) /* This TBD is the */ |
338 | /* last for this frame */ | 324 | /* last for this frame */ |
@@ -347,8 +333,7 @@ struct tbd_t | |||
347 | * Receive Buffer Descriptor (RBD). | 333 | * Receive Buffer Descriptor (RBD). |
348 | */ | 334 | */ |
349 | typedef struct rbd_t rbd_t; | 335 | typedef struct rbd_t rbd_t; |
350 | struct rbd_t | 336 | struct rbd_t { |
351 | { | ||
352 | unsigned short rbd_status; /* Written by the 82586 */ | 337 | unsigned short rbd_status; /* Written by the 82586 */ |
353 | #define RBD_STATUS_EOF (0x1 << 15) /* This RBD is the */ | 338 | #define RBD_STATUS_EOF (0x1 << 15) /* This RBD is the */ |
354 | /* last for this frame */ | 339 | /* last for this frame */ |
@@ -365,14 +350,13 @@ struct rbd_t | |||
365 | /* buffer can hold */ | 350 | /* buffer can hold */ |
366 | }; | 351 | }; |
367 | 352 | ||
368 | #define rbdoff(p,f) toff(rbd_t, p, f) | 353 | #define rbdoff(p, f) toff(rbd_t, p, f) |
369 | 354 | ||
370 | /* | 355 | /* |
371 | * Frame Descriptor (FD). | 356 | * Frame Descriptor (FD). |
372 | */ | 357 | */ |
373 | typedef struct fd_t fd_t; | 358 | typedef struct fd_t fd_t; |
374 | struct fd_t | 359 | struct fd_t { |
375 | { | ||
376 | unsigned short fd_status; /* Written by the 82586 */ | 360 | unsigned short fd_status; /* Written by the 82586 */ |
377 | #define FD_STATUS_C (0x1 << 15) /* Completed storing frame */ | 361 | #define FD_STATUS_C (0x1 << 15) /* Completed storing frame */ |
378 | #define FD_STATUS_B (0x1 << 14) /* FD was consumed by RU */ | 362 | #define FD_STATUS_B (0x1 << 14) /* FD was consumed by RU */ |
@@ -403,7 +387,7 @@ in case, we leave the space. | |||
403 | /* Written by 82586 */ | 387 | /* Written by 82586 */ |
404 | }; | 388 | }; |
405 | 389 | ||
406 | #define fdoff(p,f) toff(fd_t, p, f) | 390 | #define fdoff(p, f) toff(fd_t, p, f) |
407 | 391 | ||
408 | /* | 392 | /* |
409 | * This software may only be used and distributed | 393 | * This software may only be used and distributed |