Bladeren bron

qcacmn: Update or Correct the Reg database

Add/Correct the following Reg Database [ The following are correct values
as per Regupdate version #42 ]
1. Change superdomain 'APL5_6G_13' to 'APL7_6G_13'.
2. Add 5 GHz Regdomain FCC17 (Hex 0x0B73).
3. Add 5 GHz Regdomain FCC18 (Hex 0x0B74).
4. Add 5 GHz Regdomain APL19 (Hex 0x1240).

Change-Id: If96c38e735f3fc52c3f97571e254f352afd60569
CRs-Fixed: 3499634
Jithender Miryala 2 jaren geleden
bovenliggende
commit
7e413c719e
2 gewijzigde bestanden met toevoegingen van 10 en 7 verwijderingen
  1. 8 5
      umac/regulatory/core/src/reg_db.c
  2. 2 2
      umac/regulatory/core/src/reg_db.h

+ 8 - 5
umac/regulatory/core/src/reg_db.c

@@ -69,7 +69,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CAYMAN_ISLANDS, FCC17_WORLD, FCC1_6G_01, KY, 40, 160, 320, 0),
 	CE(CENTRAL_AFRICA_REPUBLIC, FCC17_WORLD, 0, CF, 40, 40, 0, 0),
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
-	CE(CHILE, FCC20_FCCA, APL5_6G_13, CL, 40, 160, 320, 0),
+	CE(CHILE, FCC20_FCCA, APL7_6G_13, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_CHNA, 0, CN, 40, 160, 0, 0),
 	CE(CHRISTMAS_ISLAND, APL25_ETSIC, ETSI2_6G_0C, CX, 40, 320, 0, 0),
 	CE(COLOMBIA, FCC17_FCCA, 0, CO, 40, 160, 0, 0),
@@ -290,7 +290,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CAYMAN_ISLANDS, FCC17_WORLD, FCC1_6G_01, KY, 40, 160, 320, 0),
 	CE(CENTRAL_AFRICA_REPUBLIC, FCC17_WORLD, 0, CF, 40, 40, 0, 0),
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
-	CE(CHILE, FCC20_FCCA, APL5_6G_13, CL, 40, 160, 320, 0),
+	CE(CHILE, FCC20_FCCA, APL7_6G_13, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_CHNA, 0, CN, 40, 160, 0, 0),
 	CE(CHRISTMAS_ISLAND, APL25_ETSIC, ETSI2_6G_0C, CX, 40, 160, 320, 0),
 	CE(COLOMBIA, FCC17_WORLD, 0, CO, 40, 160, 0, 0),
@@ -512,7 +512,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CAYMAN_ISLANDS, FCC17_WORLD, FCC1_6G_01, KY, 40, 160, 320, 0),
 	CE(CENTRAL_AFRICA_REPUBLIC, FCC17_WORLD, 0, CF, 40, 40, 0, 0),
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
-	CE(CHILE, FCC20_FCCA, APL5_6G_13, CL, 40, 160, 320, 0),
+	CE(CHILE, FCC20_FCCA, APL7_6G_13, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_CHNA, 0, CN, 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),
@@ -734,7 +734,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	CE(CAYMAN_ISLANDS, FCC17_WORLD, FCC1_6G_01, KY, 40, 160, 320, 0),
 	CE(CENTRAL_AFRICA_REPUBLIC, FCC17_WORLD, 0, CF, 40, 40, 0, 0),
 	CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
-	CE(CHILE, FCC20_FCCA, APL5_6G_13, CL, 40, 160, 320, 0),
+	CE(CHILE, FCC20_FCCA, APL7_6G_13, CL, 40, 160, 320, 0),
 	CE(CHINA, APL14_CHNA, 0, CN, 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),
@@ -1769,7 +1769,7 @@ static const struct sixghz_super_to_subdomains g_6g_reg_dmn_9_tuples[] = {
 	 {FCC1_CLI_LPI_DEFAULT_6G, 0},
 	 {0, 0},
 	 {APL5_CLI_VLP_6G, APL5_CLI_VLP_6G} },
-	{APL5_6G_13, APL5_AP_LPI_6G, 0, APL5_AP_VLP_6G,
+	{APL7_6G_13, APL5_AP_LPI_6G, 0, APL5_AP_VLP_6G,
 	 {APL5_CLI_LPI_DEFAULT_6G, 0},
 	 {0, 0},
 	 {APL5_CLI_VLP_6G, APL5_CLI_VLP_6G} },
@@ -2052,6 +2052,8 @@ const uint32_t reg_5g_sub_dmn_code[REG_DOMAINS_5G_MAX] = {
 	[FCC11] = 0x0B20,
 	[FCC13] = 0x0B60,
 	[FCC14] = 0x0B70,
+	[FCC17] = 0x0B73,
+	[FCC18] = 0x0B74,
 	[FCC20] = 0x0B75,
 	[FCC21] = 0x0B76,
 	[ETSI1] = 0x0130,
@@ -2083,6 +2085,7 @@ const uint32_t reg_5g_sub_dmn_code[REG_DOMAINS_5G_MAX] = {
 	[APL15] = 0x1190,
 	[APL16] = 0x1200,
 	[APL17] = 0x1210,
+	[APL19] = 0x1240,
 	[APL20] = 0x1250,
 	[APL23] = 0x1280,
 	[APL28] = 0x1233,

+ 2 - 2
umac/regulatory/core/src/reg_db.h

@@ -661,7 +661,7 @@ struct reg_domain_pair {
  *		SP(VLP to be added later)
  * @APL4_6G_11: Super domain APL3_6G_11 for Costa Rica LPI and VLP
  * @APL5_6G_12: Super domain for future purpose
- * @APL5_6G_13: Super domain APL3_6G_13 for CHILE
+ * @APL7_6G_13: Super domain APL7_6G_13 for CHILE
  * @FCC1_6G_14: Super domain FCC1_6G_14 for DOMINICAN REPUBLIC
  */
 enum reg_super_domain_6g {
@@ -682,7 +682,7 @@ enum reg_super_domain_6g {
 	FCC2_6G_10 = 0x10,
 	APL4_6G_11 = 0x11,
 	APL5_6G_12 = 0x12,
-	APL5_6G_13 = 0x13,
+	APL7_6G_13 = 0x13,
 	FCC1_6G_14 = 0x14,
 };