skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-25 22:13:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Convert typedef statements in include/rtw_mlme_ext.h

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

211
core/rtw_mlme_ext.c
View file

@ -95,7 +95,7 @@ unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0,
/******************************************************** /********************************************************
ChannelPlan definitions ChannelPlan definitions
*********************************************************/ *********************************************************/
static RT_CHANNEL_PLAN_2G RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = { static struct rt_channel_plan_2g RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
{{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, /* 0x00, RT_CHANNEL_DOMAIN_2G_WORLD , Passive scan CH 12, 13 */ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, /* 0x00, RT_CHANNEL_DOMAIN_2G_WORLD , Passive scan CH 12, 13 */
{{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, /* 0x01, RT_CHANNEL_DOMAIN_2G_ETSI1 */ {{1,2,3,4,5,6,7,8,9,10,11,12,13},13}, /* 0x01, RT_CHANNEL_DOMAIN_2G_ETSI1 */
{{1,2,3,4,5,6,7,8,9,10,11},11}, /* 0x02, RT_CHANNEL_DOMAIN_2G_FCC1 */ {{1,2,3,4,5,6,7,8,9,10,11},11}, /* 0x02, RT_CHANNEL_DOMAIN_2G_FCC1 */
@ -104,103 +104,78 @@ static RT_CHANNEL_PLAN_2G RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
{{},0}, /* 0x05, RT_CHANNEL_DOMAIN_2G_NULL */ {{},0}, /* 0x05, RT_CHANNEL_DOMAIN_2G_NULL */
}; };
static RT_CHANNEL_PLAN_5G RTW_ChannelPlan5G[RT_CHANNEL_DOMAIN_5G_MAX] = { static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
{{},0}, /* 0x00, RT_CHANNEL_DOMAIN_5G_NULL */
{{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140},19}, /* 0x01, RT_CHANNEL_DOMAIN_5G_ETSI1 */
{{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,165},24}, /* 0x02, RT_CHANNEL_DOMAIN_5G_ETSI2 */
{{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,149,153,157,161,165},22}, /* 0x03, RT_CHANNEL_DOMAIN_5G_ETSI3 */
{{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,149,153,157,161,165},24}, /* 0x04, RT_CHANNEL_DOMAIN_5G_FCC1 */
{{36,40,44,48,149,153,157,161,165},9}, /* 0x05, RT_CHANNEL_DOMAIN_5G_FCC2 */
{{36,40,44,48,52,56,60,64,149,153,157,161,165},13}, /* 0x06, RT_CHANNEL_DOMAIN_5G_FCC3 */
{{36,40,44,48,52,56,60,64,149,153,157,161},12}, /* 0x07, RT_CHANNEL_DOMAIN_5G_FCC4 */
{{149,153,157,161,165},5}, /* 0x08, RT_CHANNEL_DOMAIN_5G_FCC5 */
{{36,40,44,48,52,56,60,64},8}, /* 0x09, RT_CHANNEL_DOMAIN_5G_FCC6 */
{{36,40,44,48,52,56,60,64,100,104,108,112,116,136,140,149,153,157,161,165},20}, /* 0x0A, RT_CHANNEL_DOMAIN_5G_FCC7_IC1 */
{{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,149,153,157,161,165},20}, /* 0x0B, RT_CHANNEL_DOMAIN_5G_KCC1 */
{{36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140},19}, /* 0x0C, RT_CHANNEL_DOMAIN_5G_MKK1 */
{{36,40,44,48,52,56,60,64},8}, /* 0x0D, RT_CHANNEL_DOMAIN_5G_MKK2 */
{{100,104,108,112,116,120,124,128,132,136,140},11}, /* 0x0E, RT_CHANNEL_DOMAIN_5G_MKK3 */
{{56,60,64,100,104,108,112,116,136,140,149,153,157,161,165},15}, /* 0x0F, RT_CHANNEL_DOMAIN_5G_NCC1 */
{{56,60,64,149,153,157,161,165},8}, /* 0x10, RT_CHANNEL_DOMAIN_5G_NCC2 */
/* Driver self defined for old channel plan Compatible ,Remember to modify if have new channel plan definition ===== */
{{36,40,44,48,52,56,60,64,100,104,108,112,116,132,136,140,149,153,157,161,165},21}, /* 0x11, RT_CHANNEL_DOMAIN_5G_FCC */
{{36,40,44,48},4}, /* 0x12, RT_CHANNEL_DOMAIN_5G_JAPAN_NO_DFS */
{{36,40,44,48,149,153,157,161},8}, /* 0x13, RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS */
};
static RT_CHANNEL_PLAN_MAP RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
/* 0x00 ~ 0x1F , Old Define ===== */ /* 0x00 ~ 0x1F , Old Define ===== */
{0x02,0x11}, /* 0x00, RT_CHANNEL_DOMAIN_FCC */ {0x02}, /* 0x00, RT_CHANNEL_DOMAIN_FCC */
{0x02,0x0A}, /* 0x01, RT_CHANNEL_DOMAIN_IC */ {0x02}, /* 0x01, RT_CHANNEL_DOMAIN_IC */
{0x01,0x01}, /* 0x02, RT_CHANNEL_DOMAIN_ETSI */ {0x01}, /* 0x02, RT_CHANNEL_DOMAIN_ETSI */
{0x01,0x00}, /* 0x03, RT_CHANNEL_DOMAIN_SPAIN */ {0x01}, /* 0x03, RT_CHANNEL_DOMAIN_SPAIN */
{0x01,0x00}, /* 0x04, RT_CHANNEL_DOMAIN_FRANCE */ {0x01}, /* 0x04, RT_CHANNEL_DOMAIN_FRANCE */
{0x03,0x00}, /* 0x05, RT_CHANNEL_DOMAIN_MKK */ {0x03}, /* 0x05, RT_CHANNEL_DOMAIN_MKK */
{0x03,0x00}, /* 0x06, RT_CHANNEL_DOMAIN_MKK1 */ {0x03}, /* 0x06, RT_CHANNEL_DOMAIN_MKK1 */
{0x01,0x09}, /* 0x07, RT_CHANNEL_DOMAIN_ISRAEL */ {0x01}, /* 0x07, RT_CHANNEL_DOMAIN_ISRAEL */
{0x03,0x09}, /* 0x08, RT_CHANNEL_DOMAIN_TELEC */ {0x03}, /* 0x08, RT_CHANNEL_DOMAIN_TELEC */
{0x03,0x00}, /* 0x09, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN */ {0x03}, /* 0x09, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN */
{0x00,0x00}, /* 0x0A, RT_CHANNEL_DOMAIN_WORLD_WIDE_13 */ {0x00}, /* 0x0A, RT_CHANNEL_DOMAIN_WORLD_WIDE_13 */
{0x02,0x0F}, /* 0x0B, RT_CHANNEL_DOMAIN_TAIWAN */ {0x02}, /* 0x0B, RT_CHANNEL_DOMAIN_TAIWAN */
{0x01,0x08}, /* 0x0C, RT_CHANNEL_DOMAIN_CHINA */ {0x01}, /* 0x0C, RT_CHANNEL_DOMAIN_CHINA */
{0x02,0x06}, /* 0x0D, RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO */ {0x02}, /* 0x0D, RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO */
{0x02,0x0B}, /* 0x0E, RT_CHANNEL_DOMAIN_KOREA */ {0x02}, /* 0x0E, RT_CHANNEL_DOMAIN_KOREA */
{0x02,0x09}, /* 0x0F, RT_CHANNEL_DOMAIN_TURKEY */ {0x02}, /* 0x0F, RT_CHANNEL_DOMAIN_TURKEY */
{0x01,0x01}, /* 0x10, RT_CHANNEL_DOMAIN_JAPAN */ {0x01}, /* 0x10, RT_CHANNEL_DOMAIN_JAPAN */
{0x02,0x05}, /* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */ {0x02}, /* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */
{0x01,0x12}, /* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */ {0x01}, /* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */
{0x00,0x04}, /* 0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G */ {0x00}, /* 0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G */
{0x02,0x10}, /* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */ {0x02}, /* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */
{0x00,0x12}, /* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */ {0x00}, /* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */
{0x00,0x13}, /* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */ {0x00}, /* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */
{0x03,0x12}, /* 0x17, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */ {0x03}, /* 0x17, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */
{0x05,0x08}, /* 0x18, RT_CHANNEL_DOMAIN_PAKISTAN_NO_DFS */ {0x05}, /* 0x18, RT_CHANNEL_DOMAIN_PAKISTAN_NO_DFS */
{0x02,0x08}, /* 0x19, RT_CHANNEL_DOMAIN_TAIWAN2_NO_DFS */ {0x02}, /* 0x19, RT_CHANNEL_DOMAIN_TAIWAN2_NO_DFS */
{0x00,0x00}, /* 0x1A, */ {0x00}, /* 0x1A, */
{0x00,0x00}, /* 0x1B, */ {0x00}, /* 0x1B, */
{0x00,0x00}, /* 0x1C, */ {0x00}, /* 0x1C, */
{0x00,0x00}, /* 0x1D, */ {0x00}, /* 0x1D, */
{0x00,0x00}, /* 0x1E, */ {0x00}, /* 0x1E, */
{0x05,0x04}, /* 0x1F, RT_CHANNEL_DOMAIN_WORLD_WIDE_ONLY_5G */ {0x05}, /* 0x1F, RT_CHANNEL_DOMAIN_WORLD_WIDE_ONLY_5G */
/* 0x20 ~ 0x7F ,New Define ===== */ /* 0x20 ~ 0x7F ,New Define ===== */
{0x00,0x00}, /* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */ {0x00}, /* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */
{0x01,0x00}, /* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */ {0x01}, /* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */
{0x02,0x00}, /* 0x22, RT_CHANNEL_DOMAIN_FCC1_NULL */ {0x02}, /* 0x22, RT_CHANNEL_DOMAIN_FCC1_NULL */
{0x03,0x00}, /* 0x23, RT_CHANNEL_DOMAIN_MKK1_NULL */ {0x03}, /* 0x23, RT_CHANNEL_DOMAIN_MKK1_NULL */
{0x04,0x00}, /* 0x24, RT_CHANNEL_DOMAIN_ETSI2_NULL */ {0x04}, /* 0x24, RT_CHANNEL_DOMAIN_ETSI2_NULL */
{0x02,0x04}, /* 0x25, RT_CHANNEL_DOMAIN_FCC1_FCC1 */ {0x02}, /* 0x25, RT_CHANNEL_DOMAIN_FCC1_FCC1 */
{0x00,0x01}, /* 0x26, RT_CHANNEL_DOMAIN_WORLD_ETSI1 */ {0x00}, /* 0x26, RT_CHANNEL_DOMAIN_WORLD_ETSI1 */
{0x03,0x0C}, /* 0x27, RT_CHANNEL_DOMAIN_MKK1_MKK1 */ {0x03}, /* 0x27, RT_CHANNEL_DOMAIN_MKK1_MKK1 */
{0x00,0x0B}, /* 0x28, RT_CHANNEL_DOMAIN_WORLD_KCC1 */ {0x00}, /* 0x28, RT_CHANNEL_DOMAIN_WORLD_KCC1 */
{0x00,0x05}, /* 0x29, RT_CHANNEL_DOMAIN_WORLD_FCC2 */ {0x00}, /* 0x29, RT_CHANNEL_DOMAIN_WORLD_FCC2 */
{0x00,0x00}, /* 0x2A, */ {0x00}, /* 0x2A, */
{0x00,0x00}, /* 0x2B, */ {0x00}, /* 0x2B, */
{0x00,0x00}, /* 0x2C, */ {0x00}, /* 0x2C, */
{0x00,0x00}, /* 0x2D, */ {0x00}, /* 0x2D, */
{0x00,0x00}, /* 0x2E, */ {0x00}, /* 0x2E, */
{0x00,0x00}, /* 0x2F, */ {0x00}, /* 0x2F, */
{0x00,0x06}, /* 0x30, RT_CHANNEL_DOMAIN_WORLD_FCC3 */ {0x00}, /* 0x30, RT_CHANNEL_DOMAIN_WORLD_FCC3 */
{0x00,0x07}, /* 0x31, RT_CHANNEL_DOMAIN_WORLD_FCC4 */ {0x00}, /* 0x31, RT_CHANNEL_DOMAIN_WORLD_FCC4 */
{0x00,0x08}, /* 0x32, RT_CHANNEL_DOMAIN_WORLD_FCC5 */ {0x00}, /* 0x32, RT_CHANNEL_DOMAIN_WORLD_FCC5 */
{0x00,0x09}, /* 0x33, RT_CHANNEL_DOMAIN_WORLD_FCC6 */ {0x00}, /* 0x33, RT_CHANNEL_DOMAIN_WORLD_FCC6 */
{0x02,0x0A}, /* 0x34, RT_CHANNEL_DOMAIN_FCC1_FCC7 */ {0x02}, /* 0x34, RT_CHANNEL_DOMAIN_FCC1_FCC7 */
{0x00,0x02}, /* 0x35, RT_CHANNEL_DOMAIN_WORLD_ETSI2 */ {0x00}, /* 0x35, RT_CHANNEL_DOMAIN_WORLD_ETSI2 */
{0x00,0x03}, /* 0x36, RT_CHANNEL_DOMAIN_WORLD_ETSI3 */ {0x00}, /* 0x36, RT_CHANNEL_DOMAIN_WORLD_ETSI3 */
{0x03,0x0D}, /* 0x37, RT_CHANNEL_DOMAIN_MKK1_MKK2 */ {0x03}, /* 0x37, RT_CHANNEL_DOMAIN_MKK1_MKK2 */
{0x03,0x0E}, /* 0x38, RT_CHANNEL_DOMAIN_MKK1_MKK3 */ {0x03}, /* 0x38, RT_CHANNEL_DOMAIN_MKK1_MKK3 */
{0x02,0x0F}, /* 0x39, RT_CHANNEL_DOMAIN_FCC1_NCC1 */ {0x02}, /* 0x39, RT_CHANNEL_DOMAIN_FCC1_NCC1 */
{0x00,0x00}, /* 0x3A, */ {0x00}, /* 0x3A, */
{0x00,0x00}, /* 0x3B, */ {0x00}, /* 0x3B, */
{0x00,0x00}, /* 0x3C, */ {0x00}, /* 0x3C, */
{0x00,0x00}, /* 0x3D, */ {0x00}, /* 0x3D, */
{0x00,0x00}, /* 0x3E, */ {0x00}, /* 0x3E, */
{0x00,0x00}, /* 0x3F, */ {0x00}, /* 0x3F, */
{0x02,0x10}, /* 0x40, RT_CHANNEL_DOMAIN_FCC1_NCC2 */ {0x02}, /* 0x40, RT_CHANNEL_DOMAIN_FCC1_NCC2 */
{0x03,0x00}, /* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G */ {0x03}, /* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G */
}; };
static RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03,0x02}; /* use the conbination for max channel numbers */ static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03}; /* use the conbination for max channel numbers */
/* /*
* Search the @param channel_num in given @param channel_set * Search the @param channel_num in given @param channel_set
@ -209,7 +184,7 @@ static RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03,0x02}; /*
* *
* return the index of channel_num in channel_set, -1 if not found * return the index of channel_num in channel_set, -1 if not found
*/ */
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)
{ {
int i; int i;
for (i=0;ch_set[i].ChannelNum!=0;i++){ for (i=0;ch_set[i].ChannelNum!=0;i++){
@ -301,7 +276,7 @@ static void init_mlme_ext_priv_value(_adapter* padapter)
pmlmeext->action_public_dialog_token = 0xff; pmlmeext->action_public_dialog_token = 0xff;
} }
static int has_channel(RT_CHANNEL_INFO *channel_set, static int has_channel(struct rt_channel_info *channel_set,
u8 chanset_size, u8 chanset_size,
u8 chan) { u8 chan) {
int i; int i;
@ -315,7 +290,7 @@ static int has_channel(RT_CHANNEL_INFO *channel_set,
return 0; return 0;
} }
static void init_channel_list(_adapter *padapter, RT_CHANNEL_INFO *channel_set, static void init_channel_list(_adapter *padapter, struct rt_channel_info *channel_set,
u8 chanset_size, u8 chanset_size,
struct p2p_channels *channel_list) { struct p2p_channels *channel_list) {
@ -367,13 +342,13 @@ static void init_channel_list(_adapter *padapter, RT_CHANNEL_INFO *channel_set,
} }
static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO *channel_set) static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, struct rt_channel_info *channel_set)
{ {
u8 index,chanset_size = 0; u8 index,chanset_size = 0;
u8 b5GBand = false, b2_4GBand = false; u8 b5GBand = false, b2_4GBand = false;
u8 Index2G = 0, Index5G=0; u8 Index2G = 0, Index5G=0;
_rtw_memset(channel_set, 0, sizeof(RT_CHANNEL_INFO)*MAX_CHANNEL_NUM); _rtw_memset(channel_set, 0, sizeof(struct rt_channel_info) * MAX_CHANNEL_NUM);
if (ChannelPlan >= RT_CHANNEL_DOMAIN_MAX && ChannelPlan != RT_CHANNEL_DOMAIN_REALTEK_DEFINE) if (ChannelPlan >= RT_CHANNEL_DOMAIN_MAX && ChannelPlan != RT_CHANNEL_DOMAIN_REALTEK_DEFINE)
{ {
@ -390,19 +365,8 @@ static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO *
Index2G = RTW_ChannelPlanMap[ChannelPlan].Index2G; Index2G = RTW_ChannelPlanMap[ChannelPlan].Index2G;
} }
if (padapter->registrypriv.wireless_mode & WIRELESS_11A) if (b2_4GBand) {
{ for (index=0;index<RTW_ChannelPlan2G[Index2G].Len;index++) {
b5GBand = true;
if (RT_CHANNEL_DOMAIN_REALTEK_DEFINE == ChannelPlan)
Index5G = RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE.Index5G;
else
Index5G = RTW_ChannelPlanMap[ChannelPlan].Index5G;
}
if (b2_4GBand)
{
for (index=0;index<RTW_ChannelPlan2G[Index2G].Len;index++)
{
channel_set[chanset_size].ChannelNum = RTW_ChannelPlan2G[Index2G].Channel[index]; channel_set[chanset_size].ChannelNum = RTW_ChannelPlan2G[Index2G].Channel[index];
if ( (RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN == ChannelPlan) ||/* Channel 1~11 is active, and 12~14 is passive */ if ( (RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN == ChannelPlan) ||/* Channel 1~11 is active, and 12~14 is passive */
@ -430,23 +394,6 @@ static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO *
chanset_size++; chanset_size++;
} }
} }
if (b5GBand)
{
for (index=0;index<RTW_ChannelPlan5G[Index5G].Len;index++)
{
if ( RTW_ChannelPlan5G[Index5G].Channel[index] <= 48
|| RTW_ChannelPlan5G[Index5G].Channel[index] >= 149 ) {
channel_set[chanset_size].ChannelNum = RTW_ChannelPlan5G[Index5G].Channel[index];
if (RT_CHANNEL_DOMAIN_WORLD_WIDE_5G == ChannelPlan)/* passive scan for all 5G channels */
channel_set[chanset_size].ScanType = SCAN_PASSIVE;
else
channel_set[chanset_size].ScanType = SCAN_ACTIVE;
DBG_88E("%s(): channel_set[%d].ChannelNum = %d\n", __func__, chanset_size, channel_set[chanset_size].ChannelNum);
chanset_size++;
}
}
}
return chanset_size; return chanset_size;
} }
@ -7843,7 +7790,7 @@ static void process_80211d(PADAPTER padapter, struct wlan_bssid_ex *bssid)
{ {
struct registry_priv *pregistrypriv; struct registry_priv *pregistrypriv;
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
RT_CHANNEL_INFO *chplan_new; struct rt_channel_info *chplan_new;
u8 channel; u8 channel;
u8 i; u8 i;
@ -7856,8 +7803,8 @@ static void process_80211d(PADAPTER padapter, struct wlan_bssid_ex *bssid)
(!pmlmeext->update_channel_plan_by_ap_done)) { (!pmlmeext->update_channel_plan_by_ap_done)) {
u8 *ie, *p; u8 *ie, *p;
u32 len; u32 len;
RT_CHANNEL_PLAN chplan_ap; struct rt_channel_plan chplan_ap;
RT_CHANNEL_INFO chplan_sta[MAX_CHANNEL_NUM]; struct rt_channel_info chplan_sta[MAX_CHANNEL_NUM];
u8 country[4]; u8 country[4];
u8 fcn; /* first channel number */ u8 fcn; /* first channel number */
u8 noc; /* number of channel */ u8 noc; /* number of channel */

60
include/rtw_mlme_ext.h
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 // We just add new channel plan when the new channel plan is different from any of the following
// channel plan. // channel plan.
// If you just wnat to customize the acitions(scan period or join actions) about one of the 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 =====// //===== old channel plan mapping =====//
RT_CHANNEL_DOMAIN_FCC = 0x00, RT_CHANNEL_DOMAIN_FCC = 0x00,
RT_CHANNEL_DOMAIN_IC = 0x01, RT_CHANNEL_DOMAIN_IC = 0x01,
@ -163,10 +162,9 @@ typedef enum _RT_CHANNEL_DOMAIN
//===== Add new channel plan above this line===============// //===== Add new channel plan above this line===============//
RT_CHANNEL_DOMAIN_MAX, RT_CHANNEL_DOMAIN_MAX,
RT_CHANNEL_DOMAIN_REALTEK_DEFINE = 0x7F, 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_WORLD = 0x00, //Worldwird 13
RT_CHANNEL_DOMAIN_2G_ETSI1 = 0x01, //Europe RT_CHANNEL_DOMAIN_2G_ETSI1 = 0x01, //Europe
RT_CHANNEL_DOMAIN_2G_FCC1 = 0x02, //US RT_CHANNEL_DOMAIN_2G_FCC1 = 0x02, //US
@ -175,10 +173,9 @@ typedef enum _RT_CHANNEL_DOMAIN_2G
RT_CHANNEL_DOMAIN_2G_NULL = 0x05, RT_CHANNEL_DOMAIN_2G_NULL = 0x05,
//===== Add new channel plan above this line===============// //===== Add new channel plan above this line===============//
RT_CHANNEL_DOMAIN_2G_MAX, 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_NULL = 0x00,
RT_CHANNEL_DOMAIN_5G_ETSI1 = 0x01, //Europe RT_CHANNEL_DOMAIN_5G_ETSI1 = 0x01, //Europe
RT_CHANNEL_DOMAIN_5G_ETSI2 = 0x02, //Australia, New Zealand 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_JAPAN_NO_DFS = 0x12,
RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS = 0x13, RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS = 0x13,
RT_CHANNEL_DOMAIN_5G_MAX, 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) #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 Channel[MAX_CHANNEL_NUM];
unsigned char Len; 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 Channel[MAX_CHANNEL_NUM_2G];
unsigned char Len; unsigned char Len;
}RT_CHANNEL_PLAN_2G, *PRT_CHANNEL_PLAN_2G; };
typedef struct _RT_CHANNEL_PLAN_5G struct rt_channel_plan_map {
{
unsigned char Channel[MAX_CHANNEL_NUM_5G];
unsigned char Len;
}RT_CHANNEL_PLAN_5G, *PRT_CHANNEL_PLAN_5G;
typedef struct _RT_CHANNEL_PLAN_MAP
{
unsigned char Index2G; unsigned char Index2G;
unsigned char Index5G; };
}RT_CHANNEL_PLAN_MAP, *PRT_CHANNEL_PLAN_MAP;
enum Associated_AP enum Associated_AP {
{
atherosAP = 0, atherosAP = 0,
broadcomAP = 1, broadcomAP = 1,
ciscoAP = 2, ciscoAP = 2,
@ -243,8 +229,7 @@ enum Associated_AP
maxAP, maxAP,
}; };
typedef enum _HT_IOT_PEER enum HT_IOT_PEER {
{
HT_IOT_PEER_UNKNOWN = 0, HT_IOT_PEER_UNKNOWN = 0,
HT_IOT_PEER_REALTEK = 1, HT_IOT_PEER_REALTEK = 1,
HT_IOT_PEER_REALTEK_92SE = 2, HT_IOT_PEER_REALTEK_92SE = 2,
@ -263,11 +248,9 @@ typedef enum _HT_IOT_PEER
HT_IOT_PEER_REALTEK_WOW = 15, HT_IOT_PEER_REALTEK_WOW = 15,
HT_IOT_PEER_TENDA = 16, HT_IOT_PEER_TENDA = 16,
HT_IOT_PEER_MAX = 17 HT_IOT_PEER_MAX = 17
}HT_IOT_PEER_E, *PHTIOT_PEER_E; };
enum SCAN_STATE {
enum SCAN_STATE
{
SCAN_DISABLE = 0, SCAN_DISABLE = 0,
SCAN_START = 1, SCAN_START = 1,
SCAN_TXNULL = 2, SCAN_TXNULL = 2,
@ -392,14 +375,13 @@ struct mlme_ext_info {
}; };
// The channel information about this channel including joining, scanning, and power constraints. // 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. u8 ChannelNum; // The channel number.
RT_SCAN_TYPE ScanType; // Scan type such as passive or active scan. RT_SCAN_TYPE ScanType; // Scan type such as passive or active scan.
u32 rx_count; 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 // P2P_MAX_REG_CLASSES - Maximum number of regulatory classes
#define P2P_MAX_REG_CLASSES 10 #define P2P_MAX_REG_CLASSES 10
@ -453,7 +435,7 @@ struct mlme_ext_priv
unsigned char oper_ch_offset;//PRIME_CHNL_OFFSET unsigned char oper_ch_offset;//PRIME_CHNL_OFFSET
unsigned char max_chan_nums; 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; struct p2p_channels channel_list;
unsigned char basicrate[NumRates]; unsigned char basicrate[NumRates];
unsigned char datarate[NumRates]; unsigned char datarate[NumRates];