Merge pull request #103 from kimocoder/v5.1.5

Minor fixes / tests
This commit is contained in:
Christian B 2018-03-08 09:12:03 +01:00 committed by GitHub
commit f93a48a654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 746 additions and 799 deletions

0
hal/btc/HalBtc8703b2Ant.c Executable file → Normal file
View File

0
hal/btc/HalBtc8703b2Ant.h Executable file → Normal file
View File

View File

@ -146,7 +146,7 @@ typedef enum _BTC_WIFI_ROLE{
typedef enum _BTC_WIRELESS_FREQ{
BTC_FREQ_2_4G = 0x0,
BTC_FREQ_5G = 0x1,
BTC_FREQ_MAX
BTC_FREQ_MAX
}BTC_WIRELESS_FREQ,*PBTC_WIRELESS_FREQ;
typedef enum _BTC_WIFI_BW_MODE{
@ -155,13 +155,13 @@ typedef enum _BTC_WIFI_BW_MODE{
BTC_WIFI_BW_HT40 = 0x2,
BTC_WIFI_BW_HT80 = 0x3,
BTC_WIFI_BW_HT160 = 0x4,
BTC_WIFI_BW_MAX
BTC_WIFI_BW_MAX
}BTC_WIFI_BW_MODE,*PBTC_WIFI_BW_MODE;
typedef enum _BTC_WIFI_TRAFFIC_DIR{
BTC_WIFI_TRAFFIC_TX = 0x0,
BTC_WIFI_TRAFFIC_RX = 0x1,
BTC_WIFI_TRAFFIC_MAX
BTC_WIFI_TRAFFIC_MAX
}BTC_WIFI_TRAFFIC_DIR,*PBTC_WIFI_TRAFFIC_DIR;
typedef enum _BTC_WIFI_PNP{
@ -179,14 +179,14 @@ typedef enum _BTC_IOT_PEER
BTC_IOT_PEER_RALINK = 4,
BTC_IOT_PEER_ATHEROS = 5,
BTC_IOT_PEER_CISCO = 6,
BTC_IOT_PEER_MERU = 7,
BTC_IOT_PEER_MERU = 7,
BTC_IOT_PEER_MARVELL = 8,
BTC_IOT_PEER_REALTEK_SOFTAP = 9,// peer is RealTek SOFT_AP, by Bohn, 2009.12.17
BTC_IOT_PEER_SELF_SOFTAP = 10, // Self is SoftAP
BTC_IOT_PEER_AIRGO = 11,
BTC_IOT_PEER_INTEL = 12,
BTC_IOT_PEER_RTK_APCLIENT = 13,
BTC_IOT_PEER_REALTEK_81XX = 14,
BTC_IOT_PEER_INTEL = 12,
BTC_IOT_PEER_RTK_APCLIENT = 13,
BTC_IOT_PEER_REALTEK_81XX = 14,
BTC_IOT_PEER_REALTEK_WOW = 15,
BTC_IOT_PEER_REALTEK_JAGUAR_BCUTAP = 16,
BTC_IOT_PEER_REALTEK_JAGUAR_CCUTAP = 17,
@ -215,7 +215,7 @@ typedef enum _BTC_ANT_TYPE{
typedef enum _BTC_VENDOR{
BTC_VENDOR_LENOVO,
BTC_VENDOR_ASUS,
BTC_VENDOR_ASUS,
BTC_VENDOR_OTHER
}BTC_VENDOR,*PBTC_VENDOR;
@ -242,7 +242,7 @@ typedef enum _BTC_GET_TYPE{
// type s4Byte
BTC_GET_S4_WIFI_RSSI,
BTC_GET_S4_HS_RSSI,
// type u4Byte
BTC_GET_U4_WIFI_BW,
BTC_GET_U4_WIFI_TRAFFIC_DIRECTION,
@ -543,21 +543,21 @@ typedef VOID
IN u4Byte BitMask,
IN u4Byte Data
);
typedef u4Byte
typedef u4Byte
(*BFP_BTC_GET_BB_REG)(
IN PVOID pBtcContext,
IN u4Byte RegAddr,
IN u4Byte BitMask
);
typedef VOID
(*BFP_BTC_SET_RF_REG)(
(*BFP_BTC_SET_RF_REG)(
IN PVOID pBtcContext,
IN u1Byte eRFPath,
IN u4Byte RegAddr,
IN u4Byte BitMask,
IN u4Byte Data
);
typedef u4Byte
typedef u4Byte
(*BFP_BTC_GET_RF_REG)(
IN PVOID pBtcContext,
IN u1Byte eRFPath,
@ -598,7 +598,7 @@ typedef BOOLEAN
IN u1Byte txTime,
IN u1Byte btChnl
);
typedef u2Byte
typedef u2Byte
(*BFP_BTC_GET_BT_REG)(
IN PVOID pBtcContext,
IN u1Byte regType,
@ -620,17 +620,17 @@ typedef COL_H2C_STATUS
IN u1Byte h2c_par_len
);
typedef u4Byte
typedef u4Byte
(*BFP_BTC_GET_BT_COEX_SUPPORTED_FEATURE)(
IN PVOID pBtcContext
);
typedef u4Byte
typedef u4Byte
(*BFP_BTC_GET_BT_COEX_SUPPORTED_VERSION)(
IN PVOID pBtcContext
);
typedef u4Byte
typedef u4Byte
(*BFP_BTC_GET_PHYDM_VERSION)(
IN PVOID pBtcContext
);
@ -775,7 +775,7 @@ extern struct btc_coexist GLBtCoexist;
BOOLEAN
EXhalbtcoutsrc_InitlizeVariables(
IN PVOID Adapter
IN PVOID Adapter
);
VOID
EXhalbtcoutsrc_PowerOnSetting(

View File

@ -1,21 +1,21 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#include <drv_types.h>
@ -25,7 +25,7 @@
* MPCIE.TXT
******************************************************************************/
u1Byte Array_MP_8814A_MPCIE[] = {
u1Byte Array_MP_8814A_MPCIE[] = {
0xFF,
0xFF,
0xFF,

View File

@ -1,21 +1,21 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/

View File

@ -1,21 +1,21 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#include <drv_types.h>
@ -25,7 +25,7 @@
* MUSB.TXT
******************************************************************************/
u1Byte Array_MP_8814A_MUSB[] = {
u1Byte Array_MP_8814A_MUSB[] = {
0xFF,
0xFF,
0xFF,

View File

@ -1,21 +1,21 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/

View File

@ -29,7 +29,7 @@
#define RTL8188EE_HWIMG_SUPPORT 0
#define RTL8188EU_HWIMG_SUPPORT 0
#define RTL8188ES_HWIMG_SUPPORT 0
#elif (DEV_BUS_TYPE == RT_USB_INTERFACE)
// For 92C
#define RTL8192CE_HWIMG_SUPPORT 0
@ -52,7 +52,7 @@
#define RTL8188EE_HWIMG_SUPPORT 0
#define RTL8188EU_HWIMG_SUPPORT 0
#define RTL8188ES_HWIMG_SUPPORT 0
#elif (DEV_BUS_TYPE == RT_SDIO_INTERFACE)
// For 92C
#define RTL8192CE_HWIMG_SUPPORT 0
@ -102,7 +102,7 @@
#define RTL8188EU_HWIMG_SUPPORT 0
#define RTL8188ES_HWIMG_SUPPORT 0
#else
#else
// For 8723
#define RTL8723E_HWIMG_SUPPORT 1

View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.

File diff suppressed because it is too large Load Diff

0
hal/phydm/phydm_rxhp.c Executable file → Normal file
View File

0
hal/phydm/phydm_rxhp.h Executable file → Normal file
View File

View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
@ -19,12 +19,12 @@
******************************************************************************/
/******************************************************************************
History:
Data Who Remark (Internal History)
05/14/2012 MH Collect RTK inernal infromation and generate channel plan draft.
******************************************************************************/
//============================================================
@ -41,73 +41,73 @@
//
/*
Channel Plan Contents
Domain Code EEPROM Countries in Specific Domain
2G RD 5G RD Bit[6:0] 2G 5G
Case Old Define 00h~1Fh Old Define Old Define
1 2G_WORLD 5G_NULL 20h Worldwird 13 NA
2 2G_ETSI1 5G_NULL 21h Europe 2G NA
3 2G_FCC1 5G_NULL 22h US 2G NA
4 2G_MKK1 5G_NULL 23h Japan 2G NA
5 2G_ETSI2 5G_NULL 24h France 2G NA
Channel Plan Contents
Domain Code EEPROM Countries in Specific Domain
2G RD 5G RD Bit[6:0] 2G 5G
Case Old Define 00h~1Fh Old Define Old Define
1 2G_WORLD 5G_NULL 20h Worldwird 13 NA
2 2G_ETSI1 5G_NULL 21h Europe 2G NA
3 2G_FCC1 5G_NULL 22h US 2G NA
4 2G_MKK1 5G_NULL 23h Japan 2G NA
5 2G_ETSI2 5G_NULL 24h France 2G NA
6 2G_FCC1 5G_FCC1 25h US 2G US 5G
7 2G_WORLD 5G_ETSI1 26h Worldwird 13 Europe
8 2G_MKK1 5G_MKK1 27h Japan 2G Japan 5G
9 2G_WORLD 5G_KCC1 28h Worldwird 13 Korea
10 2G_WORLD 5G_FCC2 29h Worldwird 13 US o/w DFS Channels
11 2G_WORLD 5G_FCC3 30h Worldwird 13 India, Mexico
12 2G_WORLD 5G_FCC4 31h Worldwird 13 Venezuela
13 2G_WORLD 5G_FCC5 32h Worldwird 13 China
14 2G_WORLD 5G_FCC6 33h Worldwird 13 Israel
10 2G_WORLD 5G_FCC2 29h Worldwird 13 US o/w DFS Channels
11 2G_WORLD 5G_FCC3 30h Worldwird 13 India, Mexico
12 2G_WORLD 5G_FCC4 31h Worldwird 13 Venezuela
13 2G_WORLD 5G_FCC5 32h Worldwird 13 China
14 2G_WORLD 5G_FCC6 33h Worldwird 13 Israel
15 2G_FCC1 5G_FCC7 34h US 2G US/Canada
16 2G_WORLD 5G_ETSI2 35h Worldwird 13 Australia, New Zealand
17 2G_WORLD 5G_ETSI3 36h Worldwird 13 Russia
18 2G_MKK1 5G_MKK2 37h Japan 2G Japan (W52, W53)
19 2G_MKK1 5G_MKK3 38h Japan 2G Japan (W56)
17 2G_WORLD 5G_ETSI3 36h Worldwird 13 Russia
18 2G_MKK1 5G_MKK2 37h Japan 2G Japan (W52, W53)
19 2G_MKK1 5G_MKK3 38h Japan 2G Japan (W56)
20 2G_FCC1 5G_NCC1 39h US 2G Taiwan
NA 2G_WORLD 5G_FCC1 7F FCC FCC DFS Channels Realtek Define
2.4G Regulatory Domains
2.4G Regulatory Domains
Case 2G RD Regulation Channels Frequencyes Note Countries in Specific Domain
1 2G_WORLD ETSI 1~13 2412~2472 Passive scan CH 12, 13 Worldwird 13
2 2G_ETSI1 ETSI 1~13 2412~2472 Europe
3 2G_FCC1 FCC 1~11 2412~2462 US
4 2G_MKK1 MKK 1~13, 14 2412~2472, 2484 Japan
5 2G_ETSI2 ETSI 10~13 2457~2472 France
5G Regulatory Domains
5G Regulatory Domains
Case 5G RD Regulation Channels Frequencyes Note Countries in Specific Domain
1 5G_NULL NA NA NA Do not support 5GHz
2 5G_ETSI1 ETSI "36~48, 52~64,
1 5G_NULL NA NA NA Do not support 5GHz
2 5G_ETSI1 ETSI "36~48, 52~64,
100~140" "5180~5240, 5260~5230
5500~5700" Band1, Ban2, Band3 Europe
3 5G_ETSI2 ETSI "36~48, 52~64,
3 5G_ETSI2 ETSI "36~48, 52~64,
100~140, 149~165" "5180~5240, 5260~5230
5500~5700, 5745~5825" Band1, Ban2, Band3, Band4 Australia, New Zealand
4 5G_ETSI3 ETSI "36~48, 52~64,
100~132, 149~165"
4 5G_ETSI3 ETSI "36~48, 52~64,
100~132, 149~165"
"5180~5240, 5260~5230
5500~5660, 5745~5825" Band1, Ban2, Band3(except CH 136, 140), Band4" Russia
5 5G_FCC1 FCC "36~48, 52~64,
100~140, 149~165"
5 5G_FCC1 FCC "36~48, 52~64,
100~140, 149~165"
"5180~5240, 5260~5230
5500~5700, 5745~5825" Band1(5150~5250MHz),
Band2(5250~5350MHz),
Band3(5470~5725MHz),
Band4(5725~5850MHz)" US
6 5G_FCC2 FCC 36~48, 149~165 5180~5240, 5745~5825 Band1, Band4 FCC o/w DFS Channels
7 5G_FCC3 FCC "36~48, 52~64,
7 5G_FCC3 FCC "36~48, 52~64,
149~165" "5180~5240, 5260~5230
5745~5825" Band1, Ban2, Band4 India, Mexico
8 5G_FCC4 FCC "36~48, 52~64,
8 5G_FCC4 FCC "36~48, 52~64,
149~161" "5180~5240, 5260~5230
5745~5805" Band1, Ban2,
Band4(except CH 165)" Venezuela
@ -115,20 +115,20 @@
10 5G_FCC6 FCC 36~48, 52~64 5180~5240, 5260~5230 Band1, Band2 Israel
11 5G_FCC7
5G_IC1 FCC
IC" "36~48, 52~64,
100~116, 136, 140,
IC" "36~48, 52~64,
100~116, 136, 140,
149~165" "5180~5240, 5260~5230
5500~5580, 5680, 5700,
5500~5580, 5680, 5700,
5745~5825" "Band1, Band2,
Band3(except 5600~5650MHz),
Band4" "US
Canada"
12 5G_KCC1 KCC "36~48, 52~64,
12 5G_KCC1 KCC "36~48, 52~64,
100~124, 149~165" "5180~5240, 5260~5230
5500~5620, 5745~5825" "Band1, Ban2,
Band3(5470~5650MHz),
Band4" Korea
13 5G_MKK1 MKK "36~48, 52~64,
13 5G_MKK1 MKK "36~48, 52~64,
100~140" "5180~5240, 5260~5230
5500~5700" W52, W53, W56 Japan
14 5G_MKK2 MKK 36~48, 52~64 5180~5240, 5260~5230 W52, W53 Japan (W52, W53)
@ -136,17 +136,17 @@
16 5G_NCC1 NCC "56~64,
100~116, 136, 140,
149~165" "5260~5320
5500~5580, 5680, 5700,
5500~5580, 5680, 5700,
5745~5825" "Band2(except CH 52),
Band3(except 5600~5650MHz),
Band4" Taiwan
*/
*/
//
// 2.4G CHannel
//
// 2.4G CHannel
//
/*
2.4G Band Regulatory Domains RTL8192D
@ -176,7 +176,7 @@
//
/*
5G Band RTL8192D RTL8195 (Jaguar) Jaguar 2 Regulatory Domains
5G Band RTL8192D RTL8195 (Jaguar) Jaguar 2 Regulatory Domains
Channel Number Channel Frequency Global Global Global "US
(FCC 15.407)" "Canada
(FCC, except 5.6~5.65GHz)" Argentina, Australia, New Zealand, Brazil, S. Africa (FCC/ETSI) "Europe
@ -199,7 +199,7 @@
56 5280 v v v v v v Indoor v Indoor Indoor v v Indoor v
60 5300 v v v v v v v Indoor v Indoor Indoor v v Indoor v
64 5320 v v v v v v Indoor v Indoor Indoor v v Indoor v
"Band 3
5.47GHz
~
@ -209,13 +209,13 @@
108 5540 v v v v v v v v v v v v
112 5560 v v v v v v v v v v v
116 5580 v v v v v v v v v v v v v
120 5600 v v v Indoor v Indoor v v v
124 5620 v v v v Indoor v Indoor v v v
128 5640 v v v Indoor v Indoor v v
132 5660 v v v E v Indoor v Indoor v v
120 5600 v v v Indoor v Indoor v v v
124 5620 v v v v Indoor v Indoor v v v
128 5640 v v v Indoor v Indoor v v
132 5660 v v v E v Indoor v Indoor v v
136 5680 v v v v v v v v v
140 5700 v v E v v v v v v v
144 5720 E E E
144 5720 E E E
"Band 4
5.725GHz
~
@ -225,14 +225,14 @@
157 5785 v v v v v v v v v v v v v
161 5805 v v v v v v v v v v v v
165 5825 v v P P v v v v v v v v v
169 5845 P P P
173 5865 P P P P
177 5885 P P P
169 5845 P P P
173 5865 P P P P
177 5885 P P P
Channel Count 28 28 14 7 0 28 24 20 24 19 5 13 8 19 20 22 15 12
E: FCC accepted the ask for CH144 from Accord. PS: 160MHz 80MHz+80MHz實現 Argentina Belgium () India Israel Russia
P: Customer's requirement from James. Australia The Netherlands () Mexico Turkey Ukraine
New Zealand UK () Singapore
Brazil Switzerland ()
New Zealand UK () Singapore
Brazil Switzerland ()
*/
@ -240,11 +240,11 @@ Channel Count 28 28 14 7 0 28 24 20 24 19 5 13 8 19 20 22 15 12
/*---------------------------Define Local Constant---------------------------*/
// define Maximum Power v.s each band for each region
// define Maximum Power v.s each band for each region
// ISRAEL
// Format:
// RT_CHANNEL_DOMAIN_Region ={{{Chnl_Start, Chnl_end, Pwr_dB_Max}, {Chn2_Start, Chn2_end, Pwr_dB_Max}, {Chn3_Start, Chn3_end, Pwr_dB_Max}, {Chn4_Start, Chn4_end, Pwr_dB_Max}, {Chn5_Start, Chn5_end, Pwr_dB_Max}}, Limit_Num} */
// RT_CHANNEL_DOMAIN_FCC ={{{01,11,30}, {36,48,17}, {52,64,24}, {100,140,24}, {149,165,30}}, 5}
// RT_CHANNEL_DOMAIN_FCC ={{{01,11,30}, {36,48,17}, {52,64,24}, {100,140,24}, {149,165,30}}, 5}
// "NR" is non-release channle.
// Issue--- Israel--Russia--New Zealand
// DOMAIN_01= (2G_WORLD, 5G_NULL)
@ -272,8 +272,8 @@ Channel Count 28 28 14 7 0 28 24 20 24 19 5 13 8 19 20 22 15 12
static RT_CHANNEL_PLAN_MAXPWR ChnlPlanPwrMax_2G[] = {
// 2G_WORLD,
{{1, 13, 20}, 1},
// 2G_WORLD,
{{1, 13, 20}, 1},
// 2G_ETSI1
{{1, 13, 20}, 1},
@ -292,7 +292,7 @@ static RT_CHANNEL_PLAN_MAXPWR ChnlPlanPwrMax_2G[] = {
/*
//===========================================1:(2G_WORLD, 5G_NULL)
RT_CHANNEL_PLAN_MAXPWR RT_DOMAIN_01 ={{{01,13,20}, {NR,NR,0}, {NR,NR,0}, {NR,NR,0}, {NR,NR,0}}, 1}
RT_CHANNEL_PLAN_MAXPWR RT_DOMAIN_01 ={{{01,13,20}, {NR,NR,0}, {NR,NR,0}, {NR,NR,0}, {NR,NR,0}}, 1}
//===========================================2:(2G_ETSI1, 5G_NULL)
@ -374,56 +374,56 @@ RT_DOMAIN_23 ={{{01,13,20}, {36,48,23}, {52,64,23}, {100,140,30}, {149,165,30}},
//
// Counter & Realtek Channel plan transfer table.
//
RT_CHNL_CTRY_TBL RtCtryChnlTbl[] =
RT_CHNL_CTRY_TBL RtCtryChnlTbl[] =
{
{
RT_CTRY_AL, // "Albania阿爾巴尼亞"
RT_CTRY_AL, // "Albania阿爾巴尼亞"
"AL",
RT_2G_WORLD,
RT_5G_WORLD,
RT_5G_WORLD,
RT_CHANNEL_DOMAIN_UNDEFINED // 2G/5G world.
},
#if 0
#if 0
{
RT_CTRY_BB, // "Barbados巴巴多斯"
RT_CTRY_BB, // "Barbados巴巴多斯"
"BB",
RT_2G_WORLD,
RT_5G_NULL,
RT_5G_NULL,
RT_CHANNEL_DOMAIN_EFUSE_0x20 // 2G world. 5G_NULL
},
{
RT_CTRY_DE, // "Germany德國"
RT_CTRY_DE, // "Germany德國"
"DE",
RT_2G_WORLD,
RT_5G_ETSI1,
RT_5G_ETSI1,
RT_CHANNEL_DOMAIN_EFUSE_0x26
},
{
RT_CTRY_US, // "Germany德國"
RT_CTRY_US, // "Germany德國"
"US",
RT_2G_FCC1,
RT_5G_FCC7,
RT_5G_FCC7,
RT_CHANNEL_DOMAIN_EFUSE_0x34
},
{
RT_CTRY_JP, // "Germany德國"
RT_CTRY_JP, // "Germany德國"
"JP",
RT_2G_MKK1,
RT_5G_MKK1,
RT_5G_MKK1,
RT_CHANNEL_DOMAIN_EFUSE_0x34
},
{
RT_CTRY_TW, // "Germany德國"
RT_CTRY_TW, // "Germany德國"
"TW",
RT_2G_FCC1,
RT_5G_NCC1,
RT_5G_NCC1,
RT_CHANNEL_DOMAIN_EFUSE_0x39
},
},
#endif
}; // RtCtryChnlTbl
@ -437,13 +437,13 @@ static RT_CHANNEL_PLAN_NEW RtChnlPlan[] =
{
// Channel Plan 0x20.
{
&RtCtryChnlTbl[1], // RT_CHNL_CTRY_TBL Country & channel plan transfer table.
RT_CHANNEL_DOMAIN_EFUSE_0x20, // RT_CHANNEL_DOMAIN RT Channel Plan Define
&RtCtryChnlTbl[1], // RT_CHNL_CTRY_TBL Country & channel plan transfer table.
RT_CHANNEL_DOMAIN_EFUSE_0x20, // RT_CHANNEL_DOMAIN RT Channel Plan Define
RT_2G_WORLD, // RT_REGULATION_2G
RT_5G_NULL, // RT_REGULATION_5G
RT_WORLD, // RT_REGULATION_CMN RT Regulatory domain definition.
RT_SREQ_NA, // RT Channel plan special & customerize requirement.
CHNL_RT_2G_WORLD,
CHNL_RT_2G_WORLD_SCAN_TYPE,
&ChnlPlanPwrMax_2G[0],
@ -451,31 +451,27 @@ static RT_CHANNEL_PLAN_NEW RtChnlPlan[] =
CHNL_RT_5G_NULL,
CHNL_RT_5G_NULL_SCAN_TYPE,
},
// Channel Plan 0x26.
{
&RtCtryChnlTbl[1], // RT_CHNL_CTRY_TBL Country & channel plan transfer table.
RT_CHANNEL_DOMAIN_EFUSE_0x26, // RT_CHANNEL_DOMAIN RT Channel Plan Define
&RtCtryChnlTbl[1], // RT_CHNL_CTRY_TBL Country & channel plan transfer table.
RT_CHANNEL_DOMAIN_EFUSE_0x26, // RT_CHANNEL_DOMAIN RT Channel Plan Define
RT_2G_WORLD, // RT_REGULATION_2G
RT_5G_ETSI1, // RT_REGULATION_5G
RT_WORLD, // RT_REGULATION_CMN RT Regulatory domain definition.
RT_SREQ_NA, // RT Channel plan special & customerize requirement.
CHNL_RT_2G_WORLD, // 2G workd cannel
CHNL_RT_2G_WORLD_SCAN_TYPE,
&ChnlPlanPwrMax_2G[1],
CHNL_RT_5G_ETSI1,
CHNL_RT_5G_ETSI1_SCAN_TYPE,
}
};
#endif

View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
@ -41,7 +41,7 @@ typedef enum _RT_CHANNEL_DOMAIN_NEW
// .....
RT_CHANNEL_DOMAIN_MAX_NEW,
}RT_CHANNEL_DOMAIN_NEW, *PRT_CHANNEL_DOMAIN_NEW;
@ -90,7 +90,7 @@ typedef enum _RT_CHANNEL_DOMAIN_NEW
#define DOMAIN_CODE_5G_NCC1 \
{56,60,64,100,104,108,112,116,136,140,149,153,157,161,165}, 24
#define DOMAIN_CODE_5G_NCC2 \
{56,60,64,149,153,157,161,165}, 8
{56,60,64,149,153,157,161,165}, 8
#define UNDEFINED \
{0}, 0
#endif
@ -103,157 +103,157 @@ typedef enum _RT_CHANNEL_DOMAIN_NEW
Countries "Country Abbreviation" Domain Code SKU's Ch# of 20MHz
2G 5G Ch# of 40MHz
"Albania阿爾巴尼亞" AL Local Test
"Algeria阿爾及利亞" DZ CE TCF
"Antigua & Barbuda安提瓜島&巴布達" AG 2G_WORLD FCC TCF
"Algeria阿爾及利亞" DZ CE TCF
"Antigua & Barbuda安提瓜島&巴布達" AG 2G_WORLD FCC TCF
"Argentina阿根廷" AR 2G_WORLD Local Test
"Armenia亞美尼亞" AM 2G_WORLD ETSI
"Aruba阿魯巴島" AW 2G_WORLD FCC TCF
"Australia澳洲" AU 2G_WORLD 5G_ETSI2
"Austria奧地利" AT 2G_WORLD 5G_ETSI1 CE
"Azerbaijan阿塞拜彊" AZ 2G_WORLD CE TCF
"Bahamas巴哈馬" BS 2G_WORLD
"Australia澳洲" AU 2G_WORLD 5G_ETSI2
"Austria奧地利" AT 2G_WORLD 5G_ETSI1 CE
"Azerbaijan阿塞拜彊" AZ 2G_WORLD CE TCF
"Bahamas巴哈馬" BS 2G_WORLD
"Barbados巴巴多斯" BB 2G_WORLD FCC TCF
"Belgium比利時" BE 2G_WORLD 5G_ETSI1 CE
"Bermuda百慕達" BM 2G_WORLD FCC TCF
"Belgium比利時" BE 2G_WORLD 5G_ETSI1 CE
"Bermuda百慕達" BM 2G_WORLD FCC TCF
"Brazil巴西" BR 2G_WORLD Local Test
"Bulgaria保加利亞" BG 2G_WORLD 5G_ETSI1 CE
"Bulgaria保加利亞" BG 2G_WORLD 5G_ETSI1 CE
"Canada加拿大" CA 2G_FCC1 5G_FCC7 IC / FCC IC / FCC
"Cayman Islands開曼群島" KY 2G_WORLD 5G_ETSI1 CE
"Chile智利" CL 2G_WORLD FCC TCF
"China中國" CN 2G_WORLD 5G_FCC5 ?2002353?
"Columbia哥倫比亞" CO 2G_WORLD Voluntary
"Costa Rica哥斯達黎加" CR 2G_WORLD FCC TCF
"Cyprus塞浦路斯" CY 2G_WORLD 5G_ETSI1 CE
"Czech 捷克" CZ 2G_WORLD 5G_ETSI1 CE
"Denmark丹麥" DK 2G_WORLD 5G_ETSI1 CE
"Dominican Republic多明尼加共和國" DO 2G_WORLD FCC TCF
"Egypt埃及" EG 2G_WORLD CE T CF
"El Salvador薩爾瓦多" SV 2G_WORLD Voluntary
"Estonia愛沙尼亞" EE 2G_WORLD 5G_ETSI1 CE
"Finland芬蘭" FI 2G_WORLD 5G_ETSI1 CE
"France法國" FR 5G_E TSI1 CE
"Germany德國" DE 2G_WORLD 5G_ETSI1 CE
"Greece 希臘" GR 2G_WORLD 5G_ETSI1 CE
"Guam關島" GU 2G_WORLD
"Guatemala瓜地馬拉" GT 2G_WORLD
"Haiti海地" HT 2G_WORLD FCC TCF
"Honduras宏都拉斯" HN 2G_WORLD FCC TCF
"Hungary匈牙利" HU 2G_WORLD 5G_ETSI1 CE
"Iceland冰島" IS 2G_WORLD 5G_ETSI1 CE
"India印度" IN 2G_WORLD 5G_FCC3 FCC/CE TCF
"Ireland愛爾蘭" IE 2G_WORLD 5G_ETSI1 CE
"Israel以色列" IL 5G_F CC6 CE TCF
"Italy義大利" IT 2G_WORLD 5G_ETSI1 CE
"Japan日本" JP 2G_MKK1 5G_MKK1 MKK MKK
"Korea韓國" KR 2G_WORLD 5G_KCC1 KCC KCC
"Latvia拉脫維亞" LV 2G_WORLD 5G_ETSI1 CE
"Lithuania立陶宛" LT 2G_WORLD 5G_ETSI1 CE
"Luxembourg盧森堡" LU 2G_WORLD 5G_ETSI1 CE
"Malaysia馬來西亞" MY 2G_WORLD Local Test
"Malta馬爾他" MT 2G_WORLD 5G_ETSI1 CE
"Mexico墨西哥" MX 2G_WORLD 5G_FCC3 Local Test
"Morocco摩洛哥" MA CE TCF
"Netherlands荷蘭" NL 2G_WORLD 5G_ETSI1 CE
"New Zealand紐西蘭" NZ 2G_WORLD 5G_ETSI2
"Norway挪威" NO 2G_WORLD 5G_ETSI1 CE
"Cayman Islands開曼群島" KY 2G_WORLD 5G_ETSI1 CE
"Chile智利" CL 2G_WORLD FCC TCF
"China中國" CN 2G_WORLD 5G_FCC5 ?2002353?
"Columbia哥倫比亞" CO 2G_WORLD Voluntary
"Costa Rica哥斯達黎加" CR 2G_WORLD FCC TCF
"Cyprus塞浦路斯" CY 2G_WORLD 5G_ETSI1 CE
"Czech 捷克" CZ 2G_WORLD 5G_ETSI1 CE
"Denmark丹麥" DK 2G_WORLD 5G_ETSI1 CE
"Dominican Republic多明尼加共和國" DO 2G_WORLD FCC TCF
"Egypt埃及" EG 2G_WORLD CE T CF
"El Salvador薩爾瓦多" SV 2G_WORLD Voluntary
"Estonia愛沙尼亞" EE 2G_WORLD 5G_ETSI1 CE
"Finland芬蘭" FI 2G_WORLD 5G_ETSI1 CE
"France法國" FR 5G_E TSI1 CE
"Germany德國" DE 2G_WORLD 5G_ETSI1 CE
"Greece 希臘" GR 2G_WORLD 5G_ETSI1 CE
"Guam關島" GU 2G_WORLD
"Guatemala瓜地馬拉" GT 2G_WORLD
"Haiti海地" HT 2G_WORLD FCC TCF
"Honduras宏都拉斯" HN 2G_WORLD FCC TCF
"Hungary匈牙利" HU 2G_WORLD 5G_ETSI1 CE
"Iceland冰島" IS 2G_WORLD 5G_ETSI1 CE
"India印度" IN 2G_WORLD 5G_FCC3 FCC/CE TCF
"Ireland愛爾蘭" IE 2G_WORLD 5G_ETSI1 CE
"Israel以色列" IL 5G_F CC6 CE TCF
"Italy義大利" IT 2G_WORLD 5G_ETSI1 CE
"Japan日本" JP 2G_MKK1 5G_MKK1 MKK MKK
"Korea韓國" KR 2G_WORLD 5G_KCC1 KCC KCC
"Latvia拉脫維亞" LV 2G_WORLD 5G_ETSI1 CE
"Lithuania立陶宛" LT 2G_WORLD 5G_ETSI1 CE
"Luxembourg盧森堡" LU 2G_WORLD 5G_ETSI1 CE
"Malaysia馬來西亞" MY 2G_WORLD Local Test
"Malta馬爾他" MT 2G_WORLD 5G_ETSI1 CE
"Mexico墨西哥" MX 2G_WORLD 5G_FCC3 Local Test
"Morocco摩洛哥" MA CE TCF
"Netherlands荷蘭" NL 2G_WORLD 5G_ETSI1 CE
"New Zealand紐西蘭" NZ 2G_WORLD 5G_ETSI2
"Norway挪威" NO 2G_WORLD 5G_ETSI1 CE
"Panama巴拿馬 " PA 2G_FCC1 Voluntary
"Philippines菲律賓" PH 2G_WORLD FCC TCF
"Poland波蘭" PL 2G_WORLD 5G_ETSI1 CE
"Portugal葡萄牙" PT 2G_WORLD 5G_ETSI1 CE
"Romania羅馬尼亞" RO 2G_WORLD 5G_ETSI1 CE
"Russia俄羅斯" RU 2G_WORLD 5G_ETSI3 CE TCF
"Saudi Arabia沙地阿拉伯" SA 2G_WORLD CE TCF
"Singapore新加坡" SG 2G_WORLD
"Slovakia斯洛伐克" SK 2G_WORLD 5G_ETSI1 CE
"Slovenia斯洛維尼亞" SI 2G_WORLD 5G_ETSI1 CE
"South Africa南非" ZA 2G_WORLD CE TCF
"Spain西班牙" ES 5G_ETSI1 CE
"Sweden瑞典" SE 2G_WORLD 5G_ETSI1 CE
"Switzerland瑞士" CH 2G_WORLD 5G_ETSI1 CE
"Taiwan臺灣" TW 2G_FCC1 5G_NCC1 NCC
"Thailand泰國" TH 2G_WORLD FCC/CE TCF
"Turkey土耳其" TR 2G_WORLD
"Ukraine烏克蘭" UA 2G_WORLD Local Test
"United Kingdom英國" GB 2G_WORLD 5G_ETSI1 CE ETSI
"Poland波蘭" PL 2G_WORLD 5G_ETSI1 CE
"Portugal葡萄牙" PT 2G_WORLD 5G_ETSI1 CE
"Romania羅馬尼亞" RO 2G_WORLD 5G_ETSI1 CE
"Russia俄羅斯" RU 2G_WORLD 5G_ETSI3 CE TCF
"Saudi Arabia沙地阿拉伯" SA 2G_WORLD CE TCF
"Singapore新加坡" SG 2G_WORLD
"Slovakia斯洛伐克" SK 2G_WORLD 5G_ETSI1 CE
"Slovenia斯洛維尼亞" SI 2G_WORLD 5G_ETSI1 CE
"South Africa南非" ZA 2G_WORLD CE TCF
"Spain西班牙" ES 5G_ETSI1 CE
"Sweden瑞典" SE 2G_WORLD 5G_ETSI1 CE
"Switzerland瑞士" CH 2G_WORLD 5G_ETSI1 CE
"Taiwan臺灣" TW 2G_FCC1 5G_NCC1 NCC
"Thailand泰國" TH 2G_WORLD FCC/CE TCF
"Turkey土耳其" TR 2G_WORLD
"Ukraine烏克蘭" UA 2G_WORLD Local Test
"United Kingdom英國" GB 2G_WORLD 5G_ETSI1 CE ETSI
"United States美國" US 2G_FCC1 5G_FCC7 FCC FCC
"Venezuela委內瑞拉" VE 2G_WORLD 5G_FCC4 FCC TCF
"Vietnam越南" VN 2G_WORLD FCC/CE TCF
*/
@ -261,86 +261,86 @@ Countries "Country Abbreviation" Domain Code SKU's Ch# of 20MHz
// Counter abbervation.
typedef enum _RT_COUNTRY_DEFINE_NUM
{
RT_CTRY_AL, // "Albania阿爾巴尼亞"
RT_CTRY_DZ, // "Algeria阿爾及利亞"
RT_CTRY_AG, // "Antigua & Barbuda安提瓜島&巴布達"
RT_CTRY_AR, // "Argentina阿根廷"
RT_CTRY_AM, // "Armenia亞美尼亞"
RT_CTRY_AW, // "Aruba阿魯巴島"
RT_CTRY_AU, // "Australia澳洲"
RT_CTRY_AT, // "Austria奧地利"
RT_CTRY_AZ, // "Azerbaijan阿塞拜彊"
RT_CTRY_BS, // "Bahamas巴哈馬"
RT_CTRY_BB, // "Barbados巴巴多斯"
RT_CTRY_BE, // "Belgium比利時"
RT_CTRY_BM, // "Bermuda百慕達"
RT_CTRY_BR, // "Brazil巴西"
RT_CTRY_BG, // "Bulgaria保加利亞"
RT_CTRY_CA, // "Canada加拿大"
RT_CTRY_KY, // "Cayman Islands開曼群島"
RT_CTRY_CL, // "Chile智利"
RT_CTRY_CN, // "China中國"
RT_CTRY_CO, // "Columbia哥倫比亞"
RT_CTRY_CR, // "Costa Rica哥斯達黎加"
RT_CTRY_CY, // "Cyprus塞浦路斯"
RT_CTRY_CZ, // "Czech 捷克"
RT_CTRY_DK, // "Denmark丹麥"
RT_CTRY_DO, // "Dominican Republic多明尼加共和國"
RT_CTRY_CE, // "Egypt埃及" EG 2G_WORLD
RT_CTRY_SV, // "El Salvador薩爾瓦多"
RT_CTRY_EE, // "Estonia愛沙尼亞"
RT_CTRY_FI, // "Finland芬蘭"
RT_CTRY_FR, // "France法國"
RT_CTRY_DE, // "Germany德國"
RT_CTRY_GR, // "Greece 希臘"
RT_CTRY_GU, // "Guam關島"
RT_CTRY_GT, // "Guatemala瓜地馬拉"
RT_CTRY_HT, // "Haiti海地"
RT_CTRY_HN, // "Honduras宏都拉斯"
RT_CTRY_HU, // "Hungary匈牙利"
RT_CTRY_IS, // "Iceland冰島"
RT_CTRY_IN, // "India印度"
RT_CTRY_IE, // "Ireland愛爾蘭"
RT_CTRY_IL, // "Israel以色列"
RT_CTRY_IT, // "Italy義大利"
RT_CTRY_JP, // "Japan日本"
RT_CTRY_KR, // "Korea韓國"
RT_CTRY_LV, // "Latvia拉脫維亞"
RT_CTRY_LT, // "Lithuania立陶宛"
RT_CTRY_LU, // "Luxembourg盧森堡"
RT_CTRY_MY, // "Malaysia馬來西亞"
RT_CTRY_MT, // "Malta馬爾他"
RT_CTRY_MX, // "Mexico墨西哥"
RT_CTRY_MA, // "Morocco摩洛哥"
RT_CTRY_NL, // "Netherlands荷蘭"
RT_CTRY_NZ, // "New Zealand紐西蘭"
RT_CTRY_NO, // "Norway挪威"
RT_CTRY_PA, // "Panama巴拿馬 "
RT_CTRY_PH, // "Philippines菲律賓"
RT_CTRY_PL, // "Poland波蘭"
RT_CTRY_PT, // "Portugal葡萄牙"
RT_CTRY_RO, // "Romania羅馬尼亞"
RT_CTRY_RU, // "Russia俄羅斯"
RT_CTRY_SA, // "Saudi Arabia沙地阿拉伯"
RT_CTRY_SG, // "Singapore新加坡"
RT_CTRY_SK, // "Slovakia斯洛伐克"
RT_CTRY_SI, // "Slovenia斯洛維尼亞"
RT_CTRY_ZA, // "South Africa南非"
RT_CTRY_ES, // "Spain西班牙"
RT_CTRY_SE, // "Sweden瑞典"
RT_CTRY_CH, // "Switzerland瑞士"
RT_CTRY_TW, // "Taiwan臺灣"
RT_CTRY_TH, // "Thailand泰國"
RT_CTRY_TR, // "Turkey土耳其"
RT_CTRY_UA, // "Ukraine烏克蘭"
RT_CTRY_GB, // "United Kingdom英國"
RT_CTRY_US, // "United States美國"
RT_CTRY_VE, // "Venezuela委內瑞拉"
RT_CTRY_VN, // "Vietnam越南"
RT_CTRY_MAX, //
RT_CTRY_AL, // "Albania阿爾巴尼亞"
RT_CTRY_DZ, // "Algeria阿爾及利亞"
RT_CTRY_AG, // "Antigua & Barbuda安提瓜島&巴布達"
RT_CTRY_AR, // "Argentina阿根廷"
RT_CTRY_AM, // "Armenia亞美尼亞"
RT_CTRY_AW, // "Aruba阿魯巴島"
RT_CTRY_AU, // "Australia澳洲"
RT_CTRY_AT, // "Austria奧地利"
RT_CTRY_AZ, // "Azerbaijan阿塞拜彊"
RT_CTRY_BS, // "Bahamas巴哈馬"
RT_CTRY_BB, // "Barbados巴巴多斯"
RT_CTRY_BE, // "Belgium比利時"
RT_CTRY_BM, // "Bermuda百慕達"
RT_CTRY_BR, // "Brazil巴西"
RT_CTRY_BG, // "Bulgaria保加利亞"
RT_CTRY_CA, // "Canada加拿大"
RT_CTRY_KY, // "Cayman Islands開曼群島"
RT_CTRY_CL, // "Chile智利"
RT_CTRY_CN, // "China中國"
RT_CTRY_CO, // "Columbia哥倫比亞"
RT_CTRY_CR, // "Costa Rica哥斯達黎加"
RT_CTRY_CY, // "Cyprus塞浦路斯"
RT_CTRY_CZ, // "Czech 捷克"
RT_CTRY_DK, // "Denmark丹麥"
RT_CTRY_DO, // "Dominican Republic多明尼加共和國"
RT_CTRY_CE, // "Egypt埃及" EG 2G_WORLD
RT_CTRY_SV, // "El Salvador薩爾瓦多"
RT_CTRY_EE, // "Estonia愛沙尼亞"
RT_CTRY_FI, // "Finland芬蘭"
RT_CTRY_FR, // "France法國"
RT_CTRY_DE, // "Germany德國"
RT_CTRY_GR, // "Greece 希臘"
RT_CTRY_GU, // "Guam關島"
RT_CTRY_GT, // "Guatemala瓜地馬拉"
RT_CTRY_HT, // "Haiti海地"
RT_CTRY_HN, // "Honduras宏都拉斯"
RT_CTRY_HU, // "Hungary匈牙利"
RT_CTRY_IS, // "Iceland冰島"
RT_CTRY_IN, // "India印度"
RT_CTRY_IE, // "Ireland愛爾蘭"
RT_CTRY_IL, // "Israel以色列"
RT_CTRY_IT, // "Italy義大利"
RT_CTRY_JP, // "Japan日本"
RT_CTRY_KR, // "Korea韓國"
RT_CTRY_LV, // "Latvia拉脫維亞"
RT_CTRY_LT, // "Lithuania立陶宛"
RT_CTRY_LU, // "Luxembourg盧森堡"
RT_CTRY_MY, // "Malaysia馬來西亞"
RT_CTRY_MT, // "Malta馬爾他"
RT_CTRY_MX, // "Mexico墨西哥"
RT_CTRY_MA, // "Morocco摩洛哥"
RT_CTRY_NL, // "Netherlands荷蘭"
RT_CTRY_NZ, // "New Zealand紐西蘭"
RT_CTRY_NO, // "Norway挪威"
RT_CTRY_PA, // "Panama巴拿馬 "
RT_CTRY_PH, // "Philippines菲律賓"
RT_CTRY_PL, // "Poland波蘭"
RT_CTRY_PT, // "Portugal葡萄牙"
RT_CTRY_RO, // "Romania羅馬尼亞"
RT_CTRY_RU, // "Russia俄羅斯"
RT_CTRY_SA, // "Saudi Arabia沙地阿拉伯"
RT_CTRY_SG, // "Singapore新加坡"
RT_CTRY_SK, // "Slovakia斯洛伐克"
RT_CTRY_SI, // "Slovenia斯洛維尼亞"
RT_CTRY_ZA, // "South Africa南非"
RT_CTRY_ES, // "Spain西班牙"
RT_CTRY_SE, // "Sweden瑞典"
RT_CTRY_CH, // "Switzerland瑞士"
RT_CTRY_TW, // "Taiwan臺灣"
RT_CTRY_TH, // "Thailand泰國"
RT_CTRY_TR, // "Turkey土耳其"
RT_CTRY_UA, // "Ukraine烏克蘭"
RT_CTRY_GB, // "United Kingdom英國"
RT_CTRY_US, // "United States美國"
RT_CTRY_VE, // "Venezuela委內瑞拉"
RT_CTRY_VN, // "Vietnam越南"
RT_CTRY_MAX, //
}RT_COUNTRY_NAME, *PRT_COUNTRY_NAME;
// Scan type including active and passive scan.
typedef enum _RT_SCAN_TYPE_NEW
{
@ -349,32 +349,32 @@ typedef enum _RT_SCAN_TYPE_NEW
SCAN_PAS,
SCAN_BOTH,
}RT_SCAN_TYPE_NEW, *PRT_SCAN_TYPE_NEW;
// Power table sample.
typedef struct _RT_CHNL_PLAN_LIMIT
{
u2Byte Chnl_Start;
u2Byte Chnl_end;
u2Byte Chnl_end;
u2Byte Freq_Start;
u2Byte Freq_end;
u2Byte Freq_end;
}RT_CHNL_PLAN_LIMIT, *PRT_CHNL_PLAN_LIMIT;
//
//
// 2.4G Regulatory Domains
//
typedef enum _RT_REGULATION_DOMAIN_2G
{
RT_2G_NULL,
RT_2G_NULL,
RT_2G_WORLD,
RT_2G_ETSI1,
RT_2G_FCC1,
RT_2G_MKK1,
RT_2G_ETSI2
RT_2G_ETSI2
}RT_REGULATION_2G, *PRT_REGULATION_2G;
@ -382,12 +382,12 @@ typedef enum _RT_REGULATION_DOMAIN_2G
//{
// u1Byte Chnl;
// RT_SCAN_TYPE_NEW
//
//
//}RT_CHANNEL_BEHAVIOR, *PRT_CHANNEL_BEHAVIOR;
//typedef struct _RT_CHANNEL_PLAN_TYPE
//{
// RT_CHANNEL_BEHAVIOR
// RT_CHANNEL_BEHAVIOR
// u1Byte Chnl_num;
//}RT_CHNL_PLAN_TYPE, *PRT_CHNL_PLAN_TYPE;
@ -447,17 +447,17 @@ typedef enum _RT_REGULATION_DOMAIN_2G
{2457, 2472}, 1
//
//
// 5G Regulatory Domains
//
typedef enum _RT_REGULATION_DOMAIN_5G
{
{
RT_5G_NULL,
RT_5G_WORLD,
RT_5G_ETSI1,
RT_5G_ETSI2,
RT_5G_ETSI3,
RT_5G_FCC1,
RT_5G_FCC1,
RT_5G_FCC2,
RT_5G_FCC3,
RT_5G_FCC4,
@ -470,7 +470,7 @@ typedef enum _RT_REGULATION_DOMAIN_5G
RT_5G_MKK2,
RT_5G_MKK3,
RT_5G_NCC1,
}RT_REGULATION_5G, *PRT_REGULATION_5G;
//
@ -511,7 +511,7 @@ typedef enum _RT_REGULATION_DOMAIN_5G
#define CHNL_RT_5G_MKK3 \
{56,60,64,100,104,108,112,116,136,140,149,153,157,161,165}, 24
#define CHNL_RT_5G_NCC1 \
{56,60,64,149,153,157,161,165}, 8
{56,60,64,149,153,157,161,165}, 8
//
// 5G Channel Active or passive scan.
@ -551,26 +551,26 @@ typedef enum _RT_REGULATION_DOMAIN_5G
#define CHNL_RT_5G_MKK3_SCAN_TYPE \
{56,60,64,100,104,108,112,116,136,140,149,153,157,161,165}, 24
#define CHNL_RT_5G_NCC1_SCAN_TYPE \
{56,60,64,149,153,157,161,165}, 8
{56,60,64,149,153,157,161,165}, 8
//
//
// Global Regulation
//
typedef enum _RT_REGULATION_COMMON
{
RT_WORLD,
RT_FCC,
RT_WORLD,
RT_FCC,
RT_MKK,
RT_ETSI,
RT_IC,
RT_CE,
RT_NCC,
}RT_REGULATION_CMN, *PRT_REGULATION_CMN;
//
//
// Special requirement for different regulation domain.
// For internal test or customerize special request.
//
@ -580,46 +580,46 @@ typedef enum _RT_CHNLPLAN_SREQ
RT_SREQ_2G_ADHOC_11N = 0x00000001,
RT_SREQ_2G_ADHOC_11B = 0x00000002,
RT_SREQ_2G_ALL_PASS = 0x00000004,
RT_SREQ_2G_ALL_ACT = 0x00000008,
RT_SREQ_2G_ALL_ACT = 0x00000008,
RT_SREQ_5G_ADHOC_11N = 0x00000010,
RT_SREQ_5G_ADHOC_11AC = 0x00000020,
RT_SREQ_5G_ALL_PASS = 0x00000040,
RT_SREQ_5G_ALL_ACT = 0x00000080,
RT_SREQ_C1_PLAN = 0x00000100,
RT_SREQ_C2_PLAN = 0x00000200,
RT_SREQ_C3_PLAN = 0x00000400,
RT_SREQ_C4_PLAN = 0x00000800,
RT_SREQ_NFC_ON = 0x00001000,
RT_SREQ_C1_PLAN = 0x00000100,
RT_SREQ_C2_PLAN = 0x00000200,
RT_SREQ_C3_PLAN = 0x00000400,
RT_SREQ_C4_PLAN = 0x00000800,
RT_SREQ_NFC_ON = 0x00001000,
RT_SREQ_MASK = 0x0000FFFF, /* Requirements bit mask */
}RT_CHNLPLAN_SREQ, *PRT_CHNLPLAN_SREQ;
//
// RT_COUNTRY_NAME & RT_REGULATION_2G & RT_REGULATION_5G transfer table
//
//
//
typedef struct _RT_CHANNEL_PLAN_COUNTRY_TRANSFER_TABLE
{
{
//
// Define countery domain and corresponding
//
// Define countery domain and corresponding
//
RT_COUNTRY_NAME Country_Enum;
char Country_Name[3];
//char Domain_Name[12];
RT_REGULATION_2G Domain_2G;
RT_REGULATION_5G Domain_5G;
//char Domain_Name[12];
RT_REGULATION_2G Domain_2G;
RT_REGULATION_5G Domain_5G;
RT_CHANNEL_DOMAIN RtChDomain;
//u1Byte Country_Area;
}RT_CHNL_CTRY_TBL, *PRT_CHNL_CTRY_TBL;
#define RT_MAX_CHNL_NUM_2G 13
#define RT_MAX_CHNL_NUM_5G 44
#define RT_MAX_CHNL_NUM_5G 44
// Power table sample.
@ -640,7 +640,7 @@ typedef struct _RT_CHANNEL_PLAN_MAXPWR
RT_CHNL_PWR_LIMIT Chnl[RT_MAX_BAND_NUM];
u1Byte Band_Useful_Num;
}RT_CHANNEL_PLAN_MAXPWR, *PRT_CHANNEL_PLAN_MAXPWR;
@ -651,49 +651,45 @@ typedef struct _RT_CHANNEL_PLAN_MAXPWR
typedef struct _RT_CHANNEL_PLAN_NEW
{
{
//
// Define countery domain and corresponding
// Define countery domain and corresponding
//
//char Country_Name[36];
//u1Byte Country_Enum;
//char Domain_Name[12];
PRT_CHNL_CTRY_TBL pCtryTransfer;
RT_CHANNEL_DOMAIN RtChDomain;
RT_CHANNEL_DOMAIN RtChDomain;
RT_REGULATION_2G Domain_2G;
RT_REGULATION_5G Domain_5G;
RT_REGULATION_5G Domain_5G;
RT_REGULATION_CMN Regulator;
RT_CHNLPLAN_SREQ ChnlSreq;
//RT_CHNL_PLAN_LIMIT RtChnl;
u1Byte Chnl2G[MAX_CHANNEL_NUM]; // CHNL_RT_2G_WORLD
u1Byte Len2G;
u1Byte Chnl2GScanTp[MAX_CHANNEL_NUM]; // CHNL_RT_2G_WORLD_SCAN_TYPE
//u1Byte Freq2G[2]; // FREQ_RT_2G_WORLD
u1Byte Chnl5G[MAX_CHANNEL_NUM];
u1Byte Chnl5G[MAX_CHANNEL_NUM];
u1Byte Len5G;
u1Byte Chnl5GScanTp[MAX_CHANNEL_NUM];
//u1Byte Freq2G[2]; // FREQ_RT_2G_WORLD
RT_CHANNEL_PLAN_MAXPWR ChnlMaxPwr;
}RT_CHANNEL_PLAN_NEW, *PRT_CHANNEL_PLAN_NEW;
#endif // __RT_CHANNELPLAN_H__

View File

@ -309,7 +309,6 @@
#endif /* !CONFIG_BT_COEXIST */
#ifdef CONFIG_USB_TX_AGGREGATION
/* #define CONFIG_TX_EARLY_MODE */
#endif
@ -347,12 +346,11 @@
/* #define DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED "jeff-ap" */
/* #define DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE */
/* #define DBG_ROAMING_TEST */
/* #define DBG_HAL_INIT_PROFILING */
/*#define DBG_MEMORY_LEAK*/
/* #define DBG_MEMORY_LEAK*/
#define DBG_RX_DFRAME_RAW_DATA
#define CONFIG_USE_EXTERNAL_POWER /* NOT USB2.0 power, so no 500mA power constraint, no limitation in Power by Rate */
/* #define CONFIG_USE_EXTERNAL_POWER */ /* NOT USB2.0 power, so no 500mA power constraint, no limitation in Power by Rate */