From 7c99985ba952b094b28e1cf00153298e01917cd2 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Mon, 14 Nov 2016 16:02:44 -0800 Subject: qcacld-3.0: Regulatory domain changes Add new regulatory domains APL15 and APL16. Also add regulatory domains APl14_WORLD, APL15_WORLD and APL16_WORLD. Also change reg-domain mappings for a host of countries. This incorporates changes made 2016-10-31 to the regdomain.xls regulatory database. Change-Id: I12faa43bed83b7a046bba9b1921584ed5cef6f40 CRs-Fixed: 1090230 --- core/cds/src/cds_regdomain.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'core/cds/src') diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index 1070961dbe0a..1bd54a9692a2 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -192,6 +192,9 @@ static const struct reg_dmn_pair g_reg_dmn_pairs[] = { {APL10_WORLD, APL10, WORLD, CTRY_DEFAULT}, {APL12_WORLD, APL12, WORLD, CTRY_DEFAULT}, {APL13_WORLD, APL13, WORLD, CTRY_DEFAULT}, + {APL14_WORLD, APL14, WORLD, CTRY_DEFAULT}, + {APL15_WORLD, APL15, WORLD, CTRY_DEFAULT}, + {APL16_WORLD, APL16, WORLD, CTRY_DEFAULT}, {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, CTRY_DEFAULT}, {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, CTRY_DEFAULT}, {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, CTRY_DEFAULT}, @@ -214,19 +217,19 @@ static const struct country_code_to_reg_dmn g_all_countries[] = { {CTRY_ALGERIA, APL13_WORLD, "DZ", "ALGERIA"}, {CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", "AMERICAN SAMOA"}, {CTRY_ANGUILLA, ETSI1_WORLD, "AI", "ANGUILLA"}, - {CTRY_ARGENTINA, FCC6_WORLD, "AR", "ARGENTINA"}, + {CTRY_ARGENTINA, APL16_WORLD, "AR", "ARGENTINA"}, {CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"}, {CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"}, {CTRY_AUSTRALIA, FCC6_WORLD, "AU", "AUSTRALIA"}, {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA"}, {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN"}, {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS"}, - {CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN"}, + {CTRY_BAHRAIN, APL15_WORLD, "BH", "BAHRAIN"}, {CTRY_BANGLADESH, APL1_WORLD, "BD", "BANGLADESH"}, {CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"}, {CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"}, {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"}, - {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE"}, + {CTRY_BELIZE, FCC3_ETSIC, "BZ", "BELIZE"}, {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"}, {CTRY_BHUTAN, ETSI1_WORLD, "BT", "BHUTAN"}, {CTRY_BOLIVIA, APL8_WORLD, "BO", "BOLIVIA"}, @@ -241,7 +244,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = { {CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", "AFRICA REPUBLIC"}, {CTRY_CHAD, ETSI1_WORLD, "TD", "CHAD"}, {CTRY_CHILE, APL6_WORLD, "CL", "CHILE"}, - {CTRY_CHINA, FCC2_WORLD, "CN", "CHINA"}, + {CTRY_CHINA, APL14_WORLD, "CN", "CHINA"}, {CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", "CHRISTMAS ISLAND"}, {CTRY_COLOMBIA, FCC3_WORLD, "CO", "COLOMBIA"}, {CTRY_COSTA_RICA, FCC3_WORLD, "CR", "COSTA RICA"}, @@ -276,7 +279,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = { {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG"}, {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY"}, {CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND"}, - {CTRY_INDIA, APL6_WORLD, "IN", "INDIA"}, + {CTRY_INDIA, APL15_WORLD, "IN", "INDIA"}, {CTRY_INDONESIA, APL2_ETSIC, "ID", "INDONESIA"}, {CTRY_IRAN, APL1_WORLD, "IR", "IRAN"}, {CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND"}, @@ -313,7 +316,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = { {CTRY_MONGOLIA, FCC3_WORLD, "MN", "MONGOLIA"}, {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"}, {CTRY_MOROCCO, ETSI3_WORLD, "MA", "MOROCCO"}, - {CTRY_NAMIBIA, APL10_WORLD, "NA", "NAMIBIA"}, + {CTRY_NAMIBIA, APL9_WORLD, "NA", "NAMIBIA"}, {CTRY_NEPAL, APL6_WORLD, "NP", "NEPAL"}, {CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"}, {CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"}, @@ -421,6 +424,8 @@ static const struct reg_dmn g_reg_dmns[] = { {APL12, ETSI}, {APL13, ETSI}, {APL14, FCC}, + {APL15, FCC}, + {APL16, FCC}, {NULL1, NO_CTL}, {MKK3, MKK}, {MKK4, MKK}, -- cgit v1.2.3