qcacmn: Regdb: Add APL13_WORLD regdomain pair to regdb

Country ALGERIA uses APL13_WORLD regdomain pair.
Add 40MHz support to 5GHz and 2GHz for EGYPT.
Add 20MHz support to 5GHZ for KOREA_NORTH.

Change-Id: Ibb063aefa06e905eb57ad61d7e2d53db1a7d33a5
CRs-Fixed: 2047212
This commit is contained in:
Baila, Shashikala Prabhu
2017-05-06 16:10:35 +05:30
committed by snandini
orang tua 0c80b53ac7
melakukan a5855993db

Melihat File

@@ -361,7 +361,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
{CTRY_DOMINICA, FCC1_FCCA, "DM", "DM", 40, 160, 0}, {CTRY_DOMINICA, FCC1_FCCA, "DM", "DM", 40, 160, 0},
{CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DO", 40, 160, 0}, {CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DO", 40, 160, 0},
{CTRY_ECUADOR, FCC3_WORLD, "EC", "EC", 40, 20, 0}, {CTRY_ECUADOR, FCC3_WORLD, "EC", "EC", 40, 20, 0},
{CTRY_EGYPT, ETSI3_WORLD, "EG", "EG", 20, 20, 0}, {CTRY_EGYPT, ETSI3_WORLD, "EG", "EG", 40, 40, 0},
{CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "SV", 40, 20, 0}, {CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "SV", 40, 20, 0},
{CTRY_ESTONIA, ETSI1_WORLD, "EE", "EE", 40, 160, 0}, {CTRY_ESTONIA, ETSI1_WORLD, "EE", "EE", 40, 160, 0},
{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", "ET", 40, 160, 0}, {CTRY_ETHIOPIA, ETSI1_WORLD, "ET", "ET", 40, 160, 0},
@@ -394,7 +394,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
{CTRY_JORDAN, APL4_WORLD, "JO", "JO", 40, 160, 0}, {CTRY_JORDAN, APL4_WORLD, "JO", "JO", 40, 160, 0},
{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KZ", 40, 0, 0}, {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KZ", 40, 0, 0},
{CTRY_KENYA, APL12_WORLD, "KE", "KE", 40, 160, 0}, {CTRY_KENYA, APL12_WORLD, "KE", "KE", 40, 160, 0},
{CTRY_KOREA_NORTH, APL9_WORLD, "KP", "KP", 40, 20, 0}, {CTRY_KOREA_NORTH, APL9_WORLD, "KP", "KP", 20, 20, 0},
{CTRY_KOREA_ROC, APL9_WORLD, "KR", "KR", 40, 160, 0}, {CTRY_KOREA_ROC, APL9_WORLD, "KR", "KR", 40, 160, 0},
{CTRY_KUWAIT, ETSI3_WORLD, "KW", "KW", 40, 160, 0}, {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KW", 40, 160, 0},
{CTRY_LATVIA, ETSI1_WORLD, "LV", "LV", 40, 160, 0}, {CTRY_LATVIA, ETSI1_WORLD, "LV", "LV", 40, 160, 0},
@@ -559,6 +559,7 @@ enum reg_domains_5g {
APL9, APL9,
APL10, APL10,
APL12, APL12,
APL13,
APL14, APL14,
MKK3, MKK3,
MKK4, MKK4,
@@ -602,6 +603,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
{APL9_WORLD, APL9, WORLD}, {APL9_WORLD, APL9, WORLD},
{APL10_WORLD, APL10, WORLD}, {APL10_WORLD, APL10, WORLD},
{APL12_WORLD, APL12, WORLD}, {APL12_WORLD, APL12, WORLD},
{APL13_WORLD, APL13, WORLD},
{APL14_WORLD, APL14, WORLD}, {APL14_WORLD, APL14, WORLD},
{MKK3_MKKA, MKK3, MKKA}, {MKK3_MKKA, MKK3, MKKA},
@@ -697,6 +699,7 @@ enum reg_rules_5g {
CHAN_5490_5710_2, CHAN_5490_5710_2,
CHAN_5490_5590_1, CHAN_5490_5590_1,
CHAN_5490_5570_1, CHAN_5490_5570_1,
CHAN_5490_5650_1,
CHAN_5490_5670_1, CHAN_5490_5670_1,
CHAN_5490_5630_1, CHAN_5490_5630_1,
CHAN_5650_5730_1, CHAN_5650_5730_1,
@@ -730,6 +733,7 @@ const struct regulatory_rule reg_rules_5g[] = {
[CHAN_5490_5710_2] = {5490, 5710, 160, 20, REGULATORY_CHAN_RADAR}, [CHAN_5490_5710_2] = {5490, 5710, 160, 20, REGULATORY_CHAN_RADAR},
[CHAN_5490_5590_1] = {5490, 5590, 80, 23, REGULATORY_CHAN_RADAR}, [CHAN_5490_5590_1] = {5490, 5590, 80, 23, REGULATORY_CHAN_RADAR},
[CHAN_5490_5570_1] = {5490, 5570, 80, 30, REGULATORY_CHAN_RADAR}, [CHAN_5490_5570_1] = {5490, 5570, 80, 30, REGULATORY_CHAN_RADAR},
[CHAN_5490_5650_1] = {5490, 5650, 160, 23, REGULATORY_CHAN_RADAR},
[CHAN_5490_5670_1] = {5490, 5670, 160, 20, REGULATORY_CHAN_RADAR}, [CHAN_5490_5670_1] = {5490, 5670, 160, 20, REGULATORY_CHAN_RADAR},
[CHAN_5490_5630_1] = {5490, 5630, 80, 30, REGULATORY_CHAN_RADAR}, [CHAN_5490_5630_1] = {5490, 5630, 80, 30, REGULATORY_CHAN_RADAR},
[CHAN_5650_5730_1] = {5650, 5730, 80, 23, REGULATORY_CHAN_RADAR}, [CHAN_5650_5730_1] = {5650, 5730, 80, 23, REGULATORY_CHAN_RADAR},
@@ -822,6 +826,10 @@ const struct regdomain regdomains_5g[] = {
CHAN_5490_5570_1, CHAN_5490_5570_1,
CHAN_5735_5775_1} }, CHAN_5735_5775_1} },
[APL13] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 3, {CHAN_5170_5250_2,
CHAN_5250_5330_1,
CHAN_5490_5650_1} },
[APL14] = {CTL_FCC, DFS_CN_REG, 2, 0, 3, {CHAN_5170_5250_2, [APL14] = {CTL_FCC, DFS_CN_REG, 2, 0, 3, {CHAN_5170_5250_2,
CHAN_5250_5330_1, CHAN_5250_5330_1,
CHAN_5735_5835_4} }, CHAN_5735_5835_4} },