rtl8188eu: Convert typedef statements in include/rtw_mlme_ext.h

Some 5G material was removed. More to come.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 13:02:50 -05:00
parent f311a752bb
commit b925112e2a
2 changed files with 100 additions and 171 deletions

View file

@ -110,10 +110,9 @@ extern unsigned char WMM_PARA_OUI[];
// 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,
@ -163,10 +162,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
@ -175,10 +173,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
@ -202,36 +199,25 @@ 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
{
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,
@ -243,8 +229,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,
@ -263,11 +248,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,
@ -392,14 +375,13 @@ struct mlme_ext_info {
};
// The channel information about this channel including joining, scanning, and power constraints.
typedef struct _RT_CHANNEL_INFO
{
struct rt_channel_info {
u8 ChannelNum; // The channel number.
RT_SCAN_TYPE ScanType; // Scan type such as passive or active scan.
u32 rx_count;
}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
@ -453,7 +435,7 @@ struct mlme_ext_priv
unsigned char oper_ch_offset;//PRIME_CHNL_OFFSET
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];