From 6b89e77b3f00a52391d5f749545bbf47ae585cb2 Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Wed, 7 Jun 2017 08:51:44 +0530 Subject: [PATCH] qcacmn: Regulatory database updates Update regdomain database to "Country Table Changes Submitted 2016-10-31" regdomain spreadsheet. It includes the following changes: * Create new regdomain APL16_World and assign it to Argentina. * Assign APL15_WORLD to BAHRAIN and INDIA Change-Id: I31241847f224402bc7f125b3ed64a12ebf76242c CRs-Fixed: 2058078 --- umac/regulatory/core/src/reg_db.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.c b/umac/regulatory/core/src/reg_db.c index 54321f9802da..484224cbc989 100644 --- a/umac/regulatory/core/src/reg_db.c +++ b/umac/regulatory/core/src/reg_db.c @@ -275,6 +275,7 @@ enum reg_domain { APL13_WORLD = 0x5A, APL14_WORLD = 0x57, APL15_WORLD = 0x59, + APL16_WORLD = 0x70, MKK3_MKKA = 0xF0, MKK3_MKKB = 0x80, @@ -319,7 +320,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", "AS", 40, 160, 0}, {CTRY_ANGUILLA, ETSI1_WORLD, "AI", "AI", 40, 160, 0}, {CTRY_ARGENTINA, FCC3_WORLD, "AR1", "AR", 40, 160, 0}, - {CTRY_ARGENTINA2, FCC6_WORLD, "AR", "AR", 40, 160, 0}, + {CTRY_ARGENTINA2, APL16_WORLD, "AR", "AR", 40, 160, 0}, {CTRY_ARMENIA, ETSI4_WORLD, "AM", "AM", 40, 20, 0}, {CTRY_ARUBA, ETSI1_WORLD, "AW", "AW", 40, 160, 0}, {CTRY_AUSTRALIA, FCC3_WORLD, "AU1", "AU", 40, 160, 0}, @@ -327,7 +328,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AT", 40, 160, 0}, {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZ", 40, 160, 0}, {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BS", 40, 160, 0}, - {CTRY_BAHRAIN, APL6_WORLD, "BH", "BH", 40, 20, 0}, + {CTRY_BAHRAIN, APL15_WORLD, "BH", "BH", 40, 20, 0}, {CTRY_BANGLADESH, APL1_WORLD, "BD", "BD", 40, 160, 0}, {CTRY_BARBADOS, FCC2_WORLD, "BB", "BB", 40, 160, 0}, {CTRY_BELARUS, ETSI1_WORLD, "BY", "BY", 40, 160, 0}, @@ -384,7 +385,7 @@ const struct country_code_to_reg_domain g_all_countries[] = { {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HK", 40, 160, 0}, {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HU" , 40, 160, 0}, {CTRY_ICELAND, ETSI1_WORLD, "IS", "IS" , 40, 160, 0}, - {CTRY_INDIA, APL6_WORLD, "IN", "IN", 40, 160, 0}, + {CTRY_INDIA, APL15_WORLD, "IN", "IN", 40, 160, 0}, {CTRY_INDONESIA, APL2_ETSIC, "ID", "ID", 40, 20, 0}, {CTRY_IRAN, APL1_WORLD, "IR", "IR", 40, 160, 0}, {CTRY_IRELAND, ETSI1_WORLD, "IE", "IE", 40, 160, 0}, @@ -561,6 +562,8 @@ enum reg_domains_5g { APL12, APL13, APL14, + APL15, + APL16, MKK3, MKK4, MKK5, @@ -605,6 +608,8 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = { {APL12_WORLD, APL12, WORLD}, {APL13_WORLD, APL13, WORLD}, {APL14_WORLD, APL14, WORLD}, + {APL15_WORLD, APL15, WORLD}, + {APL16_WORLD, APL16, WORLD}, {MKK3_MKKA, MKK3, MKKA}, {MKK3_MKKC, MKK3, MKKC}, @@ -692,17 +697,21 @@ enum reg_rules_5g { CHAN_5250_5330_2, CHAN_5250_5330_3, CHAN_5250_5330_4, + CHAN_5250_5330_5, + CHAN_5250_5330_6, CHAN_5490_5730_1, CHAN_5490_5730_2, CHAN_5490_5730_3, CHAN_5490_5710_1, CHAN_5490_5710_2, CHAN_5490_5590_1, + CHAN_5490_5590_2, CHAN_5490_5570_1, CHAN_5490_5650_1, CHAN_5490_5670_1, CHAN_5490_5630_1, CHAN_5650_5730_1, + CHAN_5650_5730_2, CHAN_5735_5835_1, CHAN_5735_5835_2, CHAN_5735_5835_3, @@ -726,17 +735,21 @@ const struct regulatory_rule reg_rules_5g[] = { [CHAN_5250_5330_2] = {5250, 5330, 80, 20, REGULATORY_CHAN_RADAR}, [CHAN_5250_5330_3] = {5250, 5330, 80, 17, REGULATORY_CHAN_RADAR}, [CHAN_5250_5330_4] = {5250, 5330, 80, 30, REGULATORY_CHAN_RADAR}, + [CHAN_5250_5330_5] = {5250, 5330, 80, 23, 0}, + [CHAN_5250_5330_6] = {5250, 5330, 80, 30, 0}, [CHAN_5490_5730_1] = {5490, 5730, 160, 23, REGULATORY_CHAN_RADAR}, [CHAN_5490_5730_2] = {5490, 5730, 160, 30, REGULATORY_CHAN_RADAR}, [CHAN_5490_5730_3] = {5490, 5730, 160, 20, REGULATORY_CHAN_NO_IR}, [CHAN_5490_5710_1] = {5490, 5710, 160, 30, 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_2] = {5490, 5590, 80, 30, 0}, [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_5630_1] = {5490, 5630, 80, 30, REGULATORY_CHAN_RADAR}, [CHAN_5650_5730_1] = {5650, 5730, 80, 23, REGULATORY_CHAN_RADAR}, + [CHAN_5650_5730_2] = {5650, 5730, 80, 30, 0}, [CHAN_5735_5835_1] = {5735, 5835, 80, 23, 0}, [CHAN_5735_5835_2] = {5735, 5835, 80, 30, 0}, [CHAN_5735_5835_3] = {5735, 5835, 80, 20, 0}, @@ -834,6 +847,16 @@ const struct regdomain regdomains_5g[] = { CHAN_5250_5330_1, CHAN_5735_5835_4} }, + [APL15] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5250_2, + CHAN_5250_5330_5, + CHAN_5735_5835_2} }, + + [APL16] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5250_1, + CHAN_5250_5330_6, + CHAN_5490_5590_2, + CHAN_5650_5730_2, + CHAN_5735_5835_2} }, + [MKK3] = {CTL_MKK, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5170_5250_3} }, [MKK4] = {CTL_MKK, DFS_MKK_REG, 2, 0, 2, {CHAN_5170_5250_3,