Commit 26233e6e authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman

staging: vt6656: code cleanup, replaced U16 macro with u16

Removed custom macro for unsigned 16-bit integers.
Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 442f9cb5
...@@ -111,8 +111,8 @@ typedef enum tagWZONETYPE { ...@@ -111,8 +111,8 @@ typedef enum tagWZONETYPE {
typedef struct tagSCmdRequest { typedef struct tagSCmdRequest {
u8 name[16]; u8 name[16];
void *data; void *data;
U16 wResult; u16 wResult;
U16 wCmdCode; u16 wCmdCode;
} SCmdRequest, *PSCmdRequest; } SCmdRequest, *PSCmdRequest;
// //
...@@ -132,8 +132,8 @@ typedef struct tagSCmdScan { ...@@ -132,8 +132,8 @@ typedef struct tagSCmdScan {
typedef struct tagSCmdBSSJoin { typedef struct tagSCmdBSSJoin {
U16 wBSSType; u16 wBSSType;
U16 wBBPType; u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2]; u8 ssid[SSID_MAXLEN + 2];
U32 uChannel; U32 uChannel;
BOOL bPSEnable; BOOL bPSEnable;
...@@ -164,8 +164,8 @@ typedef struct tagSWPAResult { ...@@ -164,8 +164,8 @@ typedef struct tagSWPAResult {
typedef struct tagSCmdStartAP { typedef struct tagSCmdStartAP {
U16 wBSSType; u16 wBSSType;
U16 wBBPType; u16 wBBPType;
u8 ssid[SSID_MAXLEN + 2]; u8 ssid[SSID_MAXLEN + 2];
U32 uChannel; U32 uChannel;
U32 uBeaconInt; U32 uBeaconInt;
...@@ -192,8 +192,8 @@ typedef struct tagSBSSIDItem { ...@@ -192,8 +192,8 @@ typedef struct tagSBSSIDItem {
U32 uChannel; U32 uChannel;
u8 abyBSSID[BSSID_LEN]; u8 abyBSSID[BSSID_LEN];
u8 abySSID[SSID_MAXLEN + 1]; u8 abySSID[SSID_MAXLEN + 1];
U16 wBeaconInterval; u16 wBeaconInterval;
U16 wCapInfo; u16 wCapInfo;
u8 byNetType; u8 byNetType;
BOOL bWEPOn; BOOL bWEPOn;
U32 uRSSI; U32 uRSSI;
...@@ -210,21 +210,21 @@ typedef struct tagSBSSIDList { ...@@ -210,21 +210,21 @@ typedef struct tagSBSSIDList {
typedef struct tagSNodeItem { typedef struct tagSNodeItem {
// STA info // STA info
U16 wAID; u16 wAID;
u8 abyMACAddr[6]; u8 abyMACAddr[6];
U16 wTxDataRate; u16 wTxDataRate;
U16 wInActiveCount; u16 wInActiveCount;
U16 wEnQueueCnt; u16 wEnQueueCnt;
U16 wFlags; u16 wFlags;
BOOL bPWBitOn; BOOL bPWBitOn;
u8 byKeyIndex; u8 byKeyIndex;
U16 wWepKeyLength; u16 wWepKeyLength;
u8 abyWepKey[WEP_KEYMAXLEN]; u8 abyWepKey[WEP_KEYMAXLEN];
// Auto rate fallback vars // Auto rate fallback vars
BOOL bIsInFallback; BOOL bIsInFallback;
U32 uTxFailures; U32 uTxFailures;
U32 uTxAttempts; U32 uTxAttempts;
U16 wFailureRatio; u16 wFailureRatio;
} SNodeItem; } SNodeItem;
...@@ -240,7 +240,7 @@ typedef struct tagSNodeList { ...@@ -240,7 +240,7 @@ typedef struct tagSNodeList {
typedef struct tagSCmdLinkStatus { typedef struct tagSCmdLinkStatus {
BOOL bLink; BOOL bLink;
U16 wBSSType; u16 wBSSType;
u8 byState; u8 byState;
u8 abyBSSID[BSSID_LEN]; u8 abyBSSID[BSSID_LEN];
u8 abySSID[SSID_MAXLEN + 2]; u8 abySSID[SSID_MAXLEN + 2];
...@@ -418,8 +418,8 @@ struct viawget_hostapd_param { ...@@ -418,8 +418,8 @@ struct viawget_hostapd_param {
u8 sta_addr[6]; u8 sta_addr[6];
union { union {
struct { struct {
U16 aid; u16 aid;
U16 capability; u16 capability;
u8 tx_supp_rates; u8 tx_supp_rates;
} add_sta; } add_sta;
struct { struct {
...@@ -431,7 +431,7 @@ struct viawget_hostapd_param { ...@@ -431,7 +431,7 @@ struct viawget_hostapd_param {
U32 err; U32 err;
u8 idx; u8 idx;
u8 seq[8]; u8 seq[8];
U16 key_len; u16 key_len;
u8 key[0]; u8 key[0];
} crypt; } crypt;
struct { struct {
...@@ -439,8 +439,8 @@ struct viawget_hostapd_param { ...@@ -439,8 +439,8 @@ struct viawget_hostapd_param {
U32 flags_or; U32 flags_or;
} set_flags_sta; } set_flags_sta;
struct { struct {
U16 rid; u16 rid;
U16 len; u16 len;
u8 data[0]; u8 data[0];
} rid; } rid;
struct { struct {
...@@ -448,8 +448,8 @@ struct viawget_hostapd_param { ...@@ -448,8 +448,8 @@ struct viawget_hostapd_param {
u8 data[0]; u8 data[0];
} generic_elem; } generic_elem;
struct { struct {
U16 cmd; u16 cmd;
U16 reason_code; u16 reason_code;
} mlme; } mlme;
struct { struct {
u8 ssid_len; u8 ssid_len;
......
...@@ -79,7 +79,6 @@ typedef int BOOL; ...@@ -79,7 +79,6 @@ typedef int BOOL;
typedef signed char I8; /* 8-bit signed integer */ typedef signed char I8; /* 8-bit signed integer */
typedef unsigned short U16; /* 16-bit unsigned integer */
typedef unsigned long U32; /* 32-bit unsigned integer */ typedef unsigned long U32; /* 32-bit unsigned integer */
typedef char CHAR; typedef char CHAR;
......
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