瀏覽代碼

qcacmn: Update Automotive Regulatory Database to 40th version

Update Automotive Regulatory Database to 40th version, sync with
change 'Change-Id: I7fa7f1e9f3e6fcd6aa6ecd5aa21bd4e82aeb19a0'

Replicate 'Country Mapping for Linux Android' table for 'AUTO'.

Change-Id: I8dcee18ae3bb687f5724f18ece0cff9e2144b558
CRs-Fixed: 3293159
Huashan Qu 2 年之前
父節點
當前提交
75cc8cdf78
共有 1 個文件被更改,包括 24 次插入16 次删除
  1. 24 16
      umac/regulatory/core/src/reg_db.c

+ 24 - 16
umac/regulatory/core/src/reg_db.c

@@ -486,7 +486,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(ARGENTINA, APL17_ETSIC, 0, AR, 40, 160, 0, 0),
 	CE(ARMENIA, APL4_WORLD, 0, AM, 40, 160, 0, 0),
 	CE(ARUBA, ETSI1_WORLD, 0, AW, 40, 160, 0, 0),
-	CE(AUSTRALIA, APL25_ETSIC, 0, AU, 40, 160, 0, 0),
+	CE(AUSTRALIA, APL25_ETSIC, ETSI2_6G_0C, AU, 40, 160, 320, 0),
 	CE(AUSTRIA, ETSI13_WORLD, 0, AT, 40, 160, 0, 0),
 	CE(AZERBAIJAN, ETSI8_WORLD, 0, AZ, 40, 160, 0, 0),
 	CE(BAHAMAS, FCC17_WORLD, 0, BS, 40, 160, 0, 0),
@@ -500,10 +500,12 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(BHUTAN, ETSI1_WORLD, 0, BT, 40, 160, 0, 0),
 	CE(BOLIVIA, FCC17_WORLD, 0, BO, 40, 160, 0, 0),
 	CE(BOSNIA_HERZ, ETSI13_WORLD, 0, BA, 40, 160, 0, 0),
+	CE(BOTSWANA, ETSI13_WORLD, 0, BW, 40, 160, 0, 0),
 	CE(BRAZIL, FCC18_ETSIC, FCC1_6G_07, BR, 40, 160, 320, 0),
 	CE(BRUNEI_DARUSSALAM, FCC17_WORLD, 0, BN, 40, 160, 0, 0),
-	CE(BULGARIA, ETSI13_WORLD, 0, BG, 40, 160, 0, 0),
+	CE(BULGARIA, ETSI13_WORLD, ETSI1_6G_02, BG, 40, 160, 320, 0),
 	CE(BURKINA_FASO, FCC17_WORLD, 0, BF, 40, 160, 0, 0),
+	CE(BURUNDI, ETSI13_WORLD, 0, BI, 40, 160, 0, 0),
 	CE(CAMBODIA, ETSI1_WORLD, 0, KH, 40, 160, 0, 0),
 	CE(CAMEROON, ETSI1_WORLD, 0, CM, 40, 160, 0, 0),
 	CE(CANADA, FCC6_FCCA, FCC1_6G_05, CA, 40, 160, 320, 0),
@@ -512,7 +514,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
 	CE(CHILE, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
-	CE(CHRISTMAS_ISLAND, APL25_ETSIC, 0, CX, 40, 160, 0, 0),
+	CE(CHRISTMAS_ISLAND, APL25_ETSIC, ETSI2_6G_0C, CX, 40, 160, 320, 0),
 	CE(COLOMBIA, FCC17_FCCA, 0, CO, 40, 160, 0, 0),
 	CE(CONGO, ETSI12_WORLD, 0, CG, 40, 160, 0, 0),
 	CE(CONGO_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, 0, CD, 40, 160, 0, 0),
@@ -533,12 +535,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
 	CE(FALKLAND_ISLANDS, ETSI13_WORLD, ETSI1_6G_02, FK, 40, 160, 320, 0),
 	CE(FAROE_ISLANDS, ETSI13_WORLD, ETSI1_6G_02, FO, 40, 160, 320, 0),
+	CE(FIJI, APL1_WORLD, 0, FJ, 40, 160, 0, 0),
 	CE(FINLAND, ETSI13_WORLD, ETSI1_6G_02, FI, 40, 160, 320, 0),
 	CE(FRANCE, ETSI13_WORLD, ETSI1_6G_02, FR, 40, 160, 320, 0),
 	CE(FRENCH_GUIANA, ETSI13_WORLD, ETSI1_6G_02, GF, 40, 160, 320, 0),
 	CE(FRENCH_POLYNESIA, ETSI13_WORLD, ETSI1_6G_02, PF, 40, 160, 320, 0),
 	CE(FRENCH_SOUTHERN_TERRITORIES, ETSI13_WORLD, ETSI1_6G_02, TF, 40, 160,
 	   320, 0),
+	CE(GABON, ETSI3_WORLD, 0, GA, 40, 160, 0, 0),
 	CE(GEORGIA, ETSI1_WORLD, 0, GE, 40, 160, 0, 0),
 	CE(GERMANY, ETSI13_WORLD, ETSI1_6G_02, DE, 40, 160, 320, 0),
 	CE(GHANA, FCC17_WORLD, 0, GH, 40, 160, 0, 0),
@@ -552,12 +556,12 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(GUERNSEY, ETSI13_WORLD, ETSI1_6G_02, GG, 40, 160, 320, 0),
 	CE(GUYANA, APL1_ETSIC, 0, GY, 40, 160, 0, 0),
 	CE(HAITI, FCC17_FCCA, 0, HT, 40, 160, 0, 0),
-	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, APL25_ETSIC, 0, HM, 40, 160, 0,
-	   0),
+	CE(HEARD_ISLAND_AND_MCDONALD_ISLANDS, APL25_ETSIC, ETSI2_6G_0C, HM, 40,
+	   160, 320, 0),
 	CE(HOLY_SEE, ETSI13_WORLD, 0, VA, 40, 160, 0, 0),
 	CE(HONDURAS, FCC13_WORLD, FCC1_6G_07, HN, 40, 160, 320, 0),
-	CE(HONG_KONG, APL20_WORLD, 0, HK, 40, 160, 0, 0),
-	CE(HUNGARY, ETSI13_WORLD, 0, HU, 40, 160, 0, 0),
+	CE(HONG_KONG, APL20_WORLD, ETSI2_6G_03, HK, 40, 160, 320, 0),
+	CE(HUNGARY, ETSI13_WORLD, ETSI1_6G_02, HU, 40, 160, 320, 0),
 	CE(ICELAND, ETSI13_WORLD, ETSI1_6G_02, IS, 40, 160, 320, 0),
 	CE(INDIA, APL19_ETSIC, 0, IN, 40, 160, 0, 0),
 	CE(INDONESIA, APL2_ETSID, 0, ID, 40, 80, 0, 0),
@@ -571,14 +575,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(JAPAN15, MKK5_MKKC, 0, JP, 40, 160, 0, 0),
 	CE(XA, MKK5_MKKA, 0, XA, 40, 160, 0, 0),
 	CE(JERSEY, ETSI13_WORLD, ETSI1_6G_02, JE, 40, 160, 320, 0),
-	CE(JORDAN, APL4_WORLD, 0, JO, 40, 160, 0, 0),
+	CE(JORDAN, APL4_WORLD, ETSI1_6G_02, JO, 40, 160, 320, 0),
 	CE(KAZAKHSTAN, MKK5_MKKC, 0, KZ, 40, 160, 0, 0),
 	CE(KENYA, ETSI13_WORLD, 0, KE, 40, 160, 0, 0),
 	CE(KOREA_ROC, APL9_MKKC, APL1_6G_04, KR, 40, 160, 160, 0),
 	CE(KUWAIT, ETSI13_WORLD, 0, KW, 40, 160, 0, 0),
+	CE(LAO_PEOPLES_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, FCC1_6G_05, LA, 40,
+	   160, 320, 0),
 	CE(LATVIA, ETSI13_WORLD, 0, LV, 40, 160, 0, 0),
 	CE(LEBANON, FCC17_WORLD, 0, LB, 40, 160, 0, 0),
 	CE(LESOTHO, ETSI1_WORLD, 0, LS, 40, 160, 0, 0),
+	CE(LIBYA, ETSI12_WORLD, 0, LY, 40, 160, 0, 0),
 	CE(LIECHTENSTEIN, ETSI13_WORLD, ETSI1_6G_02, LI, 40, 160, 320, 0),
 	CE(LITHUANIA, ETSI13_WORLD, ETSI1_6G_02, LT, 40, 160, 320, 0),
 	CE(LUXEMBOURG, ETSI13_WORLD, 0, LU, 40, 160, 0, 0),
@@ -614,7 +621,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	   0),
 	CE(NICARAGUA, APL27_FCCA, 0, NI, 40, 160, 0, 0),
 	CE(NIUE, APL26_ETSIC, 0, NU, 40, 160, 0, 0),
-	CE(NORFOLK_ISLAND, APL25_ETSIC, 0, NF, 40, 160, 0, 0),
+	CE(NORFOLK_ISLAND, APL25_ETSIC, ETSI2_6G_0C, NF, 40, 160, 320, 0),
 	CE(NORWAY, ETSI13_WORLD, ETSI1_6G_02, NO, 40, 160, 320, 0),
 	CE(OMAN, ETSI1_WORLD, 0, OM, 40, 160, 0, 0),
 	CE(PAKISTAN, APL1_ETSIC, 0, PK, 40, 160, 0, 0),
@@ -627,11 +634,11 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(POLAND, ETSI13_WORLD, 0, PL, 40, 160, 0, 0),
 	CE(PORTUGAL, ETSI13_WORLD, ETSI1_6G_02, PT, 40, 160, 320, 0),
 	CE(PUERTO_RICO, FCC3_FCCA, FCC1_6G_01, PR, 40, 160, 320, 0),
-	CE(QATAR, ETSI14_WORLD, 0, QA, 40, 160, 0, 0),
+	CE(QATAR, ETSI14_WORLD, ETSI1_6G_02, QA, 40, 160, 320, 0),
 	CE(REUNION, ETSI13_WORLD, ETSI1_6G_02, RE, 40, 160, 320, 0),
 	CE(ROMANIA, ETSI13_WORLD, 0, RO, 40, 160, 0, 0),
 	CE(RUSSIA, ETSI8_WORLD, 0, RU, 40, 160, 0, 0),
-	CE(RWANDA, FCC17_WORLD, 0, RW, 40, 160, 0, 0),
+	CE(RWANDA, ETSI13_WORLD, 0, RW, 40, 160, 0, 0),
 	CE(SAINT_BARTHELEMY, ETSI1_WORLD, ETSI1_6G_02, BL, 40, 160, 0, 0),
 	CE(SAINT_HELENA_ASCENSION_AND_TRISTAN_DA_CUNHA, ETSI13_WORLD,
 	   ETSI1_6G_02, SH, 40, 160, 320, 0),
@@ -645,8 +652,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(SAMOA, ETSI1_WORLD, 0, WS, 40, 40, 0, 0),
 	CE(SAN_MARINO, ETSI13_WORLD, 0, SM, 40, 160, 0, 0),
 	CE(SAO_TOME_AND_PRINCIPE, FCC17_WORLD, 0, ST, 40, 160, 0, 0),
-	CE(SAUDI_ARABIA, ETSI15_WORLD, APL6_6G_0A, SA, 40, 160, 320, 0),
-	CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
+	CE(SAUDI_ARABIA, ETSI13_WORLD, APL6_6G_0A, SA, 40, 160, 320, 0),
+	CE(SENEGAL, ETSI1_WORLD, 0, SN, 40, 160, 0, 0),
 	CE(SERBIA, ETSI13_WORLD, 0, RS, 40, 160, 0, 0),
 	CE(SINGAPORE, APL20_WORLD, 0, SG, 40, 160, 0, 0),
 	CE(SINT_MAARTEN, ETSI13_WORLD, ETSI1_6G_02, SX, 40, 160, 320, 0),
@@ -671,7 +678,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(UGANDA, FCC17_WORLD, 0, UG, 40, 160, 0, 0),
 	CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, 0),
 	CE(UAE, ETSI13_WORLD, APL3_6G_08, AE, 40, 160, 320, 0),
-	CE(UNITED_KINGDOM, ETSI13_WORLD, ETSI2_6G_03, GB, 40, 160, 320, 0),
+	CE(UNITED_KINGDOM, ETSI18_WORLD, ETSI2_6G_03, GB, 40, 160, 320, 0),
 	CE(UNITED_STATES, FCC8_FCCA, FCC1_6G_01, US, 40, 160, 320, 0),
 	CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC3_FCCA, FCC1_6G_01, UM, 40,
 	   160, 320, 0),
@@ -679,12 +686,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(UZBEKISTAN, ETSI3_WORLD, 0, UZ, 40, 160, 0, 0),
 	CE(VANUATU, FCC17_WORLD, 0, VU, 40, 160, 0, 0),
 	CE(VENEZUELA, FCC2_ETSIC, 0, VE, 40, 160, 0, 0),
-	CE(VIET_NAM, APL20_WORLD, 0, VN, 40, 80, 0, 0),
+	CE(VIET_NAM, ETSI15_WORLD, 0, VN, 40, 160, 0, 0),
 	CE(VIRGIN_ISLANDS, FCC3_FCCA, FCC1_6G_01, VI, 40, 160, 320, 0),
 	CE(VIRGIN_ISLANDS_BRITISH, ETSI13_WORLD, ETSI1_6G_02, VG, 40, 160, 320,
 	   0),
 	CE(WALLIS_AND_FUTUNA, ETSI1_WORLD, 0, WF, 40, 160, 0, 0),
 	CE(YEMEN, ETSI1_WORLD, 0, YE, 40, 160, 0, 0),
+	CE(ZAMBIA, ETSI13_WORLD, 0, ZM, 40, 160, 0, 0),
 	CE(ZIMBABWE, ETSI1_WORLD, 0, ZW, 40, 160, 0, 0),
 };
 #else
@@ -728,8 +736,8 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
 	CE(CHILE, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
-	CE(COLOMBIA, FCC17_FCCA, 0, CO, 40, 160, 0, 0),
 	CE(CHRISTMAS_ISLAND, APL25_ETSIC, ETSI2_6G_0C, CX, 40, 160, 320, 0),
+	CE(COLOMBIA, FCC17_FCCA, 0, CO, 40, 160, 0, 0),
 	CE(CONGO, ETSI12_WORLD, 0, CG, 40, 160, 0, 0),
 	CE(CONGO_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, 0, CD, 40, 160, 0, 0),
 	CE(COOK_ISLANDS, APL26_ETSIC, 0, CK, 40, 160, 0, 0),