skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove typedef statements from include/rtw_mlme_ext.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-13 17:25:11 -05:00
parent e233420466
commit 8a5e5024c0
4 changed files with 41 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

71
include/rtw_mlme_ext.h
View file

@ -111,10 +111,9 @@ extern unsigned char REALTEK_96B_IE[];
// We just add new channel plan when the new channel plan is different from any of the following
// channel plan.
// If you just wnat to customize the acitions(scan period or join actions) about one of the channel plan,
// customize them in RT_CHANNEL_INFO in the RT_CHANNEL_LIST.
// customize them in struct rt_channel_info in the RT_CHANNEL_LIST.
//
typedef enum _RT_CHANNEL_DOMAIN
{
enum rt_channel_domain {
//===== old channel plan mapping =====//
RT_CHANNEL_DOMAIN_FCC = 0x00,
RT_CHANNEL_DOMAIN_IC = 0x01,
@ -164,10 +163,9 @@ typedef enum _RT_CHANNEL_DOMAIN
//===== Add new channel plan above this line===============//
RT_CHANNEL_DOMAIN_MAX,
RT_CHANNEL_DOMAIN_REALTEK_DEFINE = 0x7F,
}RT_CHANNEL_DOMAIN, *PRT_CHANNEL_DOMAIN;
};
typedef enum _RT_CHANNEL_DOMAIN_2G
{
enum RT_CHANNEL_DOMAIN_2G {
RT_CHANNEL_DOMAIN_2G_WORLD = 0x00, //Worldwird 13
RT_CHANNEL_DOMAIN_2G_ETSI1 = 0x01, //Europe
RT_CHANNEL_DOMAIN_2G_FCC1 = 0x02, //US
@ -176,10 +174,9 @@ typedef enum _RT_CHANNEL_DOMAIN_2G
RT_CHANNEL_DOMAIN_2G_NULL = 0x05,
//===== Add new channel plan above this line===============//
RT_CHANNEL_DOMAIN_2G_MAX,
}RT_CHANNEL_DOMAIN_2G, *PRT_CHANNEL_DOMAIN_2G;
};
typedef enum _RT_CHANNEL_DOMAIN_5G
{
enum RT_CHANNEL_DOMAIN_5G {
RT_CHANNEL_DOMAIN_5G_NULL = 0x00,
RT_CHANNEL_DOMAIN_5G_ETSI1 = 0x01, //Europe
RT_CHANNEL_DOMAIN_5G_ETSI2 = 0x02, //Australia, New Zealand
@ -203,36 +200,32 @@ typedef enum _RT_CHANNEL_DOMAIN_5G
RT_CHANNEL_DOMAIN_5G_JAPAN_NO_DFS = 0x12,
RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS = 0x13,
RT_CHANNEL_DOMAIN_5G_MAX,
}RT_CHANNEL_DOMAIN_5G, *PRT_CHANNEL_DOMAIN_5G;
};
#define rtw_is_channel_plan_valid(chplan) (chplan<RT_CHANNEL_DOMAIN_MAX || chplan == RT_CHANNEL_DOMAIN_REALTEK_DEFINE)
typedef struct _RT_CHANNEL_PLAN
{
struct rt_channel_plan {
unsigned char Channel[MAX_CHANNEL_NUM];
unsigned char Len;
}RT_CHANNEL_PLAN, *PRT_CHANNEL_PLAN;
};
typedef struct _RT_CHANNEL_PLAN_2G
struct rt_channel_plan_2g
{
unsigned char Channel[MAX_CHANNEL_NUM_2G];
unsigned char Len;
}RT_CHANNEL_PLAN_2G, *PRT_CHANNEL_PLAN_2G;
};
typedef struct _RT_CHANNEL_PLAN_5G
{
struct rt_channel_plan_5g {
unsigned char Channel[MAX_CHANNEL_NUM_5G];
unsigned char Len;
}RT_CHANNEL_PLAN_5G, *PRT_CHANNEL_PLAN_5G;
};
typedef struct _RT_CHANNEL_PLAN_MAP
{
struct rt_channel_plan_map {
unsigned char Index2G;
unsigned char Index5G;
}RT_CHANNEL_PLAN_MAP, *PRT_CHANNEL_PLAN_MAP;
};
enum Associated_AP
{
enum Associated_AP {
atherosAP = 0,
broadcomAP = 1,
ciscoAP = 2,
@ -244,8 +237,7 @@ enum Associated_AP
maxAP,
};
typedef enum _HT_IOT_PEER
{
enum HT_IOT_PEER {
HT_IOT_PEER_UNKNOWN = 0,
HT_IOT_PEER_REALTEK = 1,
HT_IOT_PEER_REALTEK_92SE = 2,
@ -264,11 +256,9 @@ typedef enum _HT_IOT_PEER
HT_IOT_PEER_REALTEK_WOW = 15,
HT_IOT_PEER_TENDA = 16,
HT_IOT_PEER_MAX = 17
}HT_IOT_PEER_E, *PHTIOT_PEER_E;
};
enum SCAN_STATE
{
enum SCAN_STATE {
SCAN_DISABLE = 0,
SCAN_START = 1,
SCAN_TXNULL = 2,
@ -301,12 +291,7 @@ struct ss_res
struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT];
};
//#define AP_MODE 0x0C
//#define STATION_MODE 0x08
//#define AD_HOC_MODE 0x04
//#define NO_LINK_MODE 0x00
#define WIFI_FW_NULL_STATE _HW_STATE_NOLINK_
#define WIFI_FW_NULL_STATE _HW_STATE_NOLINK_
#define WIFI_FW_STATION_STATE _HW_STATE_STATION_
#define WIFI_FW_AP_STATE _HW_STATE_AP_
#define WIFI_FW_ADHOC_STATE _HW_STATE_ADHOC_
@ -394,19 +379,15 @@ struct mlme_ext_info {
};
// The channel information about this channel including joining, scanning, and power constraints.
typedef struct _RT_CHANNEL_INFO
{
u8 ChannelNum; // The channel number.
struct rt_channel_info {
u8 ChannelNum; // The channel number.
RT_SCAN_TYPE ScanType; // Scan type such as passive or active scan.
//u16 ScanPeriod; // Listen time in millisecond in this channel.
//s32 MaxTxPwrDbm; // Max allowed tx power.
//u32 ExInfo; // Extended Information for this channel.
#ifdef CONFIG_AP_MODE
u32 rx_count;
#endif
}RT_CHANNEL_INFO, *PRT_CHANNEL_INFO;
};
int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch);
int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch);
// P2P_MAX_REG_CLASSES - Maximum number of regulatory classes
#define P2P_MAX_REG_CLASSES 10
@ -452,15 +433,13 @@ struct mlme_ext_priv
u64 mgnt_80211w_IPN;
u64 mgnt_80211w_IPN_rx;
#endif //CONFIG_IEEE80211W
//struct fw_priv fwpriv;
unsigned char cur_channel;
unsigned char cur_bwmode;
unsigned char cur_ch_offset;//PRIME_CHNL_OFFSET
unsigned char cur_wireless_mode; // NETWORK_TYPE
unsigned char max_chan_nums;
RT_CHANNEL_INFO channel_set[MAX_CHANNEL_NUM];
struct rt_channel_info channel_set[MAX_CHANNEL_NUM];
struct p2p_channels channel_list;
unsigned char basicrate[NumRates];
unsigned char datarate[NumRates];

4
include/wifi.h
View file

@ -676,12 +676,12 @@ struct ADDBA_request {
__le16 BA_starting_seqctrl;
} __attribute__ ((packed));
typedef enum _HT_CAP_AMPDU_FACTOR {
enum HT_CAP_AMPDU_FACTOR {
MAX_AMPDU_FACTOR_8K = 0,
MAX_AMPDU_FACTOR_16K = 1,
MAX_AMPDU_FACTOR_32K = 2,
MAX_AMPDU_FACTOR_64K = 3,
} HT_CAP_AMPDU_FACTOR;
};
/* 802.11n HT capabilities masks */
#define IEEE80211_HT_CAP_SUP_WIDTH 0x0002