diff options
author | Andres More <more.andres@gmail.com> | 2010-05-12 17:59:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-14 16:23:06 -0400 |
commit | 26233e6e27e890d592708a3cd233667820c40254 (patch) | |
tree | 0ecc7039f217642ec0dab9c0f5681a9960b95f14 /drivers/staging | |
parent | 442f9cb5858ec86f6f05df0058cec0bf4b873534 (diff) |
staging: vt6656: code cleanup, replaced U16 macro with u16
Removed custom macro for unsigned 16-bit integers.
Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vt6656/iocmd.h | 46 | ||||
-rw-r--r-- | drivers/staging/vt6656/ttype.h | 1 |
2 files changed, 23 insertions, 24 deletions
diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h index 7fcf085bb4c..27ba8b7fc0f 100644 --- a/drivers/staging/vt6656/iocmd.h +++ b/drivers/staging/vt6656/iocmd.h | |||
@@ -111,8 +111,8 @@ typedef enum tagWZONETYPE { | |||
111 | typedef struct tagSCmdRequest { | 111 | typedef struct tagSCmdRequest { |
112 | u8 name[16]; | 112 | u8 name[16]; |
113 | void *data; | 113 | void *data; |
114 | U16 wResult; | 114 | u16 wResult; |
115 | U16 wCmdCode; | 115 | u16 wCmdCode; |
116 | } SCmdRequest, *PSCmdRequest; | 116 | } SCmdRequest, *PSCmdRequest; |
117 | 117 | ||
118 | // | 118 | // |
@@ -132,8 +132,8 @@ typedef struct tagSCmdScan { | |||
132 | 132 | ||
133 | typedef struct tagSCmdBSSJoin { | 133 | typedef struct tagSCmdBSSJoin { |
134 | 134 | ||
135 | U16 wBSSType; | 135 | u16 wBSSType; |
136 | U16 wBBPType; | 136 | u16 wBBPType; |
137 | u8 ssid[SSID_MAXLEN + 2]; | 137 | u8 ssid[SSID_MAXLEN + 2]; |
138 | U32 uChannel; | 138 | U32 uChannel; |
139 | BOOL bPSEnable; | 139 | BOOL bPSEnable; |
@@ -164,8 +164,8 @@ typedef struct tagSWPAResult { | |||
164 | 164 | ||
165 | typedef struct tagSCmdStartAP { | 165 | typedef struct tagSCmdStartAP { |
166 | 166 | ||
167 | U16 wBSSType; | 167 | u16 wBSSType; |
168 | U16 wBBPType; | 168 | u16 wBBPType; |
169 | u8 ssid[SSID_MAXLEN + 2]; | 169 | u8 ssid[SSID_MAXLEN + 2]; |
170 | U32 uChannel; | 170 | U32 uChannel; |
171 | U32 uBeaconInt; | 171 | U32 uBeaconInt; |
@@ -192,8 +192,8 @@ typedef struct tagSBSSIDItem { | |||
192 | U32 uChannel; | 192 | U32 uChannel; |
193 | u8 abyBSSID[BSSID_LEN]; | 193 | u8 abyBSSID[BSSID_LEN]; |
194 | u8 abySSID[SSID_MAXLEN + 1]; | 194 | u8 abySSID[SSID_MAXLEN + 1]; |
195 | U16 wBeaconInterval; | 195 | u16 wBeaconInterval; |
196 | U16 wCapInfo; | 196 | u16 wCapInfo; |
197 | u8 byNetType; | 197 | u8 byNetType; |
198 | BOOL bWEPOn; | 198 | BOOL bWEPOn; |
199 | U32 uRSSI; | 199 | U32 uRSSI; |
@@ -210,21 +210,21 @@ typedef struct tagSBSSIDList { | |||
210 | 210 | ||
211 | typedef struct tagSNodeItem { | 211 | typedef struct tagSNodeItem { |
212 | // STA info | 212 | // STA info |
213 | U16 wAID; | 213 | u16 wAID; |
214 | u8 abyMACAddr[6]; | 214 | u8 abyMACAddr[6]; |
215 | U16 wTxDataRate; | 215 | u16 wTxDataRate; |
216 | U16 wInActiveCount; | 216 | u16 wInActiveCount; |
217 | U16 wEnQueueCnt; | 217 | u16 wEnQueueCnt; |
218 | U16 wFlags; | 218 | u16 wFlags; |
219 | BOOL bPWBitOn; | 219 | BOOL bPWBitOn; |
220 | u8 byKeyIndex; | 220 | u8 byKeyIndex; |
221 | U16 wWepKeyLength; | 221 | u16 wWepKeyLength; |
222 | u8 abyWepKey[WEP_KEYMAXLEN]; | 222 | u8 abyWepKey[WEP_KEYMAXLEN]; |
223 | // Auto rate fallback vars | 223 | // Auto rate fallback vars |
224 | BOOL bIsInFallback; | 224 | BOOL bIsInFallback; |
225 | U32 uTxFailures; | 225 | U32 uTxFailures; |
226 | U32 uTxAttempts; | 226 | U32 uTxAttempts; |
227 | U16 wFailureRatio; | 227 | u16 wFailureRatio; |
228 | 228 | ||
229 | } SNodeItem; | 229 | } SNodeItem; |
230 | 230 | ||
@@ -240,7 +240,7 @@ typedef struct tagSNodeList { | |||
240 | typedef struct tagSCmdLinkStatus { | 240 | typedef struct tagSCmdLinkStatus { |
241 | 241 | ||
242 | BOOL bLink; | 242 | BOOL bLink; |
243 | U16 wBSSType; | 243 | u16 wBSSType; |
244 | u8 byState; | 244 | u8 byState; |
245 | u8 abyBSSID[BSSID_LEN]; | 245 | u8 abyBSSID[BSSID_LEN]; |
246 | u8 abySSID[SSID_MAXLEN + 2]; | 246 | u8 abySSID[SSID_MAXLEN + 2]; |
@@ -418,8 +418,8 @@ struct viawget_hostapd_param { | |||
418 | u8 sta_addr[6]; | 418 | u8 sta_addr[6]; |
419 | union { | 419 | union { |
420 | struct { | 420 | struct { |
421 | U16 aid; | 421 | u16 aid; |
422 | U16 capability; | 422 | u16 capability; |
423 | u8 tx_supp_rates; | 423 | u8 tx_supp_rates; |
424 | } add_sta; | 424 | } add_sta; |
425 | struct { | 425 | struct { |
@@ -431,7 +431,7 @@ struct viawget_hostapd_param { | |||
431 | U32 err; | 431 | U32 err; |
432 | u8 idx; | 432 | u8 idx; |
433 | u8 seq[8]; | 433 | u8 seq[8]; |
434 | U16 key_len; | 434 | u16 key_len; |
435 | u8 key[0]; | 435 | u8 key[0]; |
436 | } crypt; | 436 | } crypt; |
437 | struct { | 437 | struct { |
@@ -439,8 +439,8 @@ struct viawget_hostapd_param { | |||
439 | U32 flags_or; | 439 | U32 flags_or; |
440 | } set_flags_sta; | 440 | } set_flags_sta; |
441 | struct { | 441 | struct { |
442 | U16 rid; | 442 | u16 rid; |
443 | U16 len; | 443 | u16 len; |
444 | u8 data[0]; | 444 | u8 data[0]; |
445 | } rid; | 445 | } rid; |
446 | struct { | 446 | struct { |
@@ -448,8 +448,8 @@ struct viawget_hostapd_param { | |||
448 | u8 data[0]; | 448 | u8 data[0]; |
449 | } generic_elem; | 449 | } generic_elem; |
450 | struct { | 450 | struct { |
451 | U16 cmd; | 451 | u16 cmd; |
452 | U16 reason_code; | 452 | u16 reason_code; |
453 | } mlme; | 453 | } mlme; |
454 | struct { | 454 | struct { |
455 | u8 ssid_len; | 455 | u8 ssid_len; |
diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index d7cf663f445..2b8419af790 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h | |||
@@ -79,7 +79,6 @@ typedef int BOOL; | |||
79 | 79 | ||
80 | typedef signed char I8; /* 8-bit signed integer */ | 80 | typedef signed char I8; /* 8-bit signed integer */ |
81 | 81 | ||
82 | typedef unsigned short U16; /* 16-bit unsigned integer */ | ||
83 | typedef unsigned long U32; /* 32-bit unsigned integer */ | 82 | typedef unsigned long U32; /* 32-bit unsigned integer */ |
84 | 83 | ||
85 | typedef char CHAR; | 84 | typedef char CHAR; |