Parcourir la source

qcacmn: Add regulatory update-25 to reg db

Add Regdomains: ETSI12, ETSI13, FCC5
Add Regdomain pairs: ETSI12_WORLD, ETSI13_WORLD
Change all Europe countries to ETSI13_World in the
LA country-to-RD mapping.

Change-Id: I4fb31fbd852994c6bcda5e6379de2f3df5aa8d4e
CRs-Fixed: 2182451
Paul Zhang il y a 7 ans
Parent
commit
b10508a903
1 fichiers modifiés avec 70 ajouts et 46 suppressions
  1. 70 46
      umac/regulatory/core/src/reg_db.c

+ 70 - 46
umac/regulatory/core/src/reg_db.c

@@ -229,6 +229,8 @@ enum reg_domain {
 	ETSI8_WORLD = 0x3D,
 	ETSI9_WORLD = 0x3E,
 	ETSI11_WORLD = 0x26,
+	ETSI12_WORLD = 0x28,
+	ETSI13_WORLD = 0x27,
 
 	APL1_WORLD = 0x52,
 	APL1_ETSIC = 0x55,
@@ -452,7 +454,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 #else
 const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", "AF", 40, 160, 0},
-	{CTRY_ALBANIA, ETSI1_WORLD, "AL", "AL", 40, 160, 0},
+	{CTRY_ALBANIA, ETSI13_WORLD, "AL", "AL", 40, 160, 0},
 	{CTRY_ALGERIA, APL13_WORLD, "DZ", "DZ", 40, 160, 0},
 	{CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", "AS", 40, 160, 0},
 	{CTRY_ANGUILLA, ETSI1_WORLD, "AI", "AI", 40, 160, 0},
@@ -460,22 +462,22 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_ARMENIA, ETSI4_WORLD, "AM", "AM", 40, 20, 0},
 	{CTRY_ARUBA, ETSI1_WORLD, "AW", "AW", 40, 160, 0},
 	{CTRY_AUSTRALIA, FCC6_WORLD, "AU", "AU", 40, 160, 0},
-	{CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AT", 40, 160, 0},
+	{CTRY_AUSTRIA, ETSI13_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, 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},
-	{CTRY_BELGIUM, ETSI1_WORLD, "BE", "BE", 40, 160, 0},
+	{CTRY_BELGIUM, ETSI13_WORLD, "BE", "BE", 40, 160, 0},
 	{CTRY_BELIZE, ETSI8_WORLD, "BZ", "BZ", 40, 160, 0},
 	{CTRY_BERMUDA, FCC3_FCCA, "BM", "BM", 40, 160, 0},
 	{CTRY_BHUTAN, ETSI1_WORLD, "BT", "BT", 40, 160, 0},
 	{CTRY_BOLIVIA, APL8_WORLD, "BO", "BO", 40, 160, 0},
-	{CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BA", 40, 160, 0},
+	{CTRY_BOSNIA_HERZ, ETSI13_WORLD, "BA", "BA", 40, 160, 0},
 	{CTRY_BRAZIL, FCC3_ETSIC, "BR", "BR", 40, 160, 0},
 	{CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BN", 40, 160, 0},
-	{CTRY_BULGARIA, ETSI1_WORLD, "BG", "BG", 40, 160, 0},
+	{CTRY_BULGARIA, ETSI13_WORLD, "BG", "BG", 40, 160, 0},
 	{CTRY_BURKINA_FASO, FCC3_WORLD, "BF", "BF", 40, 160, 0},
 	{CTRY_CAMBODIA, ETSI1_WORLD, "KH", "KH", 40, 160, 0},
 	{CTRY_CANADA, FCC3_FCCA, "CA", "CA", 40, 160, 0},
@@ -488,26 +490,26 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_COLOMBIA, FCC3_WORLD, "CO", "CO", 40, 160, 0},
 	{CTRY_COSTA_RICA, FCC3_WORLD, "CR", "CR", 40, 20, 0},
 	{CTRY_COTE_DIVOIRE, FCC3_WORLD, "CI", "CI", 40, 160, 0},
-	{CTRY_CROATIA, ETSI1_WORLD, "HR", "HR", 40, 160, 0},
-	{CTRY_CYPRUS, ETSI1_WORLD, "CY", "CY", 40, 160, 0},
-	{CTRY_CZECH, ETSI1_WORLD, "CZ", "CZ", 40, 160, 0},
-	{CTRY_DENMARK, ETSI1_WORLD, "DK", "DK", 40, 160,  0},
+	{CTRY_CROATIA, ETSI13_WORLD, "HR", "HR", 40, 160, 0},
+	{CTRY_CYPRUS, ETSI13_WORLD, "CY", "CY", 40, 160, 0},
+	{CTRY_CZECH, ETSI13_WORLD, "CZ", "CZ", 40, 160, 0},
+	{CTRY_DENMARK, ETSI13_WORLD, "DK", "DK", 40, 160,  0},
 	{CTRY_DOMINICA, FCC2_FCCA, "DM", "DM", 40, 160, 0},
 	{CTRY_DOMINICAN_REPUBLIC, FCC2_FCCA, "DO", "DO", 40, 160, 0},
 	{CTRY_ECUADOR, FCC3_WORLD, "EC", "EC", 40, 20, 0},
 	{CTRY_EGYPT, ETSI3_WORLD, "EG", "EG", 40, 40, 0},
 	{CTRY_EL_SALVADOR, FCC2_WORLD, "SV", "SV", 40, 20, 0},
-	{CTRY_ESTONIA, ETSI1_WORLD, "EE", "EE", 40, 160, 0},
+	{CTRY_ESTONIA, ETSI13_WORLD, "EE", "EE", 40, 160, 0},
 	{CTRY_ETHIOPIA, ETSI1_WORLD, "ET", "ET", 40, 160, 0},
-	{CTRY_FINLAND, ETSI1_WORLD, "FI", "FI", 40, 160, 0},
-	{CTRY_FRANCE, ETSI1_WORLD, "FR", "FR", 40, 160, 0},
-	{CTRY_FRENCH_GUIANA, ETSI1_WORLD, "GF", "GF", 40, 160, 0},
-	{CTRY_FRENCH_POLYNESIA, ETSI1_WORLD, "PF", "PF", 40, 160, 0},
+	{CTRY_FINLAND, ETSI13_WORLD, "FI", "FI", 40, 160, 0},
+	{CTRY_FRANCE, ETSI13_WORLD, "FR", "FR", 40, 160, 0},
+	{CTRY_FRENCH_GUIANA, ETSI13_WORLD, "GF", "GF", 40, 160, 0},
+	{CTRY_FRENCH_POLYNESIA, ETSI13_WORLD, "PF", "PF", 40, 160, 0},
 	{CTRY_GEORGIA, ETSI4_WORLD, "GE", "GE", 40, 160, 0},
-	{CTRY_GERMANY, ETSI1_WORLD, "DE", "DE", 40, 160, 0},
+	{CTRY_GERMANY, ETSI13_WORLD, "DE", "DE", 40, 160, 0},
 	{CTRY_GHANA, FCC3_WORLD, "GH", "GH", 40, 160, 0},
 	{CTRY_GIBRALTAR, ETSI1_WORLD, "GI", "GI", 40, 160, 0},
-	{CTRY_GREECE, ETSI1_WORLD, "GR", "GR", 40, 160, 0},
+	{CTRY_GREECE, ETSI13_WORLD, "GR", "GR", 40, 160, 0},
 	{CTRY_GREENLAND, ETSI1_WORLD, "GL", "GL", 40, 160, 0},
 	{CTRY_GRENADA, FCC3_FCCA, "GD", "GD", 40, 160, 0},
 	{CTRY_GUADELOUPE, ETSI1_WORLD, "GP", "GP", 40, 160, 0},
@@ -517,53 +519,53 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_HAITI, FCC3_FCCA, "HT", "HT", 40, 160, 0},
 	{CTRY_HONDURAS, FCC13_WORLD, "HN", "HN", 40, 160, 0},
 	{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_HUNGARY, ETSI13_WORLD, "HU", "HU", 40, 160, 0},
+	{CTRY_ICELAND, ETSI13_WORLD, "IS", "IS", 40, 160, 0},
 	{CTRY_INDIA, APL15_WORLD, "IN", "IN", 40, 160, 0},
 	{CTRY_INDONESIA, APL2_ETSIC, "ID", "ID", 40, 20, 0},
 	{CTRY_IRAQ, ETSI1_WORLD, "IQ", "IQ", 40, 160, 0},
-	{CTRY_IRELAND, ETSI1_WORLD, "IE", "IE", 40, 160, 0},
+	{CTRY_IRELAND, ETSI13_WORLD, "IE", "IE", 40, 160, 0},
 	{CTRY_ISRAEL, ETSI3_WORLD, "IL", "IL", 40, 160, 0},
-	{CTRY_ITALY, ETSI1_WORLD, "IT", "IT", 40, 160,  0},
+	{CTRY_ITALY, ETSI13_WORLD, "IT", "IT", 40, 160,  0},
 	{CTRY_JAMAICA, FCC13_WORLD, "JM", "JM", 40, 160, 0},
 	{CTRY_JORDAN, APL4_WORLD, "JO", "JO", 40, 160, 0},
 	{CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KZ", 40, 0, 0},
 	{CTRY_KENYA, APL12_WORLD, "KE", "KE", 40, 160, 0},
 	{CTRY_KOREA_ROC, APL9_WORLD, "KR", "KR", 40, 160, 0},
 	{CTRY_KUWAIT, ETSI3_WORLD, "KW", "KW", 40, 160, 0},
-	{CTRY_LATVIA, ETSI1_WORLD, "LV", "LV", 40, 160, 0},
+	{CTRY_LATVIA, ETSI13_WORLD, "LV", "LV", 40, 160, 0},
 	{CTRY_LEBANON, FCC3_WORLD, "LB", "LB", 40, 160, 0},
 	{CTRY_LESOTHO, ETSI1_WORLD, "LS", "LS", 40, 160, 0},
-	{CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LI", 40, 160, 0},
-	{CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LT", 40, 160, 0},
-	{CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LU", 40, 160, 0},
+	{CTRY_LIECHTENSTEIN, ETSI13_WORLD, "LI", "LI", 40, 160, 0},
+	{CTRY_LITHUANIA, ETSI13_WORLD, "LT", "LT", 40, 160, 0},
+	{CTRY_LUXEMBOURG, ETSI13_WORLD, "LU", "LU", 40, 160, 0},
 	{CTRY_MACAU, FCC3_WORLD, "MO", "MO", 40, 160, 0},
-	{CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MK", 40, 160, 0},
+	{CTRY_MACEDONIA, ETSI13_WORLD, "MK", "MK", 40, 160, 0},
 	{CTRY_MALAWI, ETSI1_WORLD, "MW", "MW", 40, 160, 0},
 	{CTRY_MALAYSIA, FCC11_WORLD, "MY", "MY", 40, 160, 0},
 	{CTRY_MALDIVES, APL6_WORLD, "MV", "MV", 40, 160, 0},
-	{CTRY_MALTA, ETSI1_WORLD, "MT", "MT", 40, 160, 0},
+	{CTRY_MALTA, ETSI13_WORLD, "MT", "MT", 40, 160, 0},
 	{CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", "MH", 40, 160, 0},
-	{CTRY_MARTINIQUE, ETSI1_WORLD, "MQ", "MQ", 40, 160, 0},
+	{CTRY_MARTINIQUE, ETSI13_WORLD, "MQ", "MQ", 40, 160, 0},
 	{CTRY_MAURITANIA, ETSI1_WORLD, "MR", "MR", 40, 160, 0},
 	{CTRY_MAURITIUS, FCC3_WORLD, "MU", "MU", 40, 160, 0},
 	{CTRY_MAYOTTE, ETSI1_WORLD, "YT", "YT", 40, 160, 0},
 	{CTRY_MEXICO, FCC3_ETSIC, "MX", "MX", 40, 160, 0},
 	{CTRY_MICRONESIA, FCC3_FCCA, "FM", "FM", 40, 160, 0},
-	{CTRY_MOLDOVA, ETSI1_WORLD, "MD", "MD", 40, 160, 0},
-	{CTRY_MONACO, ETSI1_WORLD, "MC", "MC", 40, 160, 0},
+	{CTRY_MOLDOVA, ETSI13_WORLD, "MD", "MD", 40, 160, 0},
+	{CTRY_MONACO, ETSI13_WORLD, "MC", "MC", 40, 160, 0},
 	{CTRY_MONGOLIA, FCC3_WORLD, "MN", "MN", 40, 160, 0},
-	{CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "ME", 40, 160, 0},
+	{CTRY_MONTENEGRO, ETSI13_WORLD, "ME", "ME", 40, 160, 0},
 	{CTRY_MOROCCO, ETSI3_WORLD, "MA", "MA", 40, 160, 0},
 	{CTRY_NAMIBIA, APL20_WORLD, "NA", "NA", 40, 160, 0},
 	{CTRY_NEPAL, APL23_WORLD, "NP", "NP", 40, 160, 0},
-	{CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NP", 40, 160, 0},
-	{CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "AN", 40, 160, 0},
+	{CTRY_NETHERLANDS, ETSI13_WORLD, "NL", "NP", 40, 160, 0},
+	{CTRY_NETHERLANDS_ANTILLES, ETSI13_WORLD, "AN", "AN", 40, 160, 0},
 	{CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NZ", 40, 160, 0},
 	{CTRY_NIGERIA, APL8_WORLD, "NG", "NG", 40, 160, 0},
 	{CTRY_NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, "MP", "MP", 40, 160, 0},
 	{CTRY_NICARAGUA, FCC3_FCCA, "NI", "NI", 40, 160, 0},
-	{CTRY_NORWAY, ETSI1_WORLD, "NO", "NO", 40, 160, 0},
+	{CTRY_NORWAY, ETSI13_WORLD, "NO", "NO", 40, 160, 0},
 	{CTRY_OMAN, ETSI1_WORLD, "OM", "OM", 40, 160, 0},
 	{CTRY_PAKISTAN, APL1_ETSIC, "PK", "PK", 40, 160, 0},
 	{CTRY_PALAU, FCC3_FCCA, "PW", "PW", 40, 160, 0},
@@ -572,46 +574,46 @@ const struct country_code_to_reg_domain g_all_countries[] = {
 	{CTRY_PARAGUAY, FCC3_WORLD, "PY", "PY", 40, 160, 0},
 	{CTRY_PERU, FCC3_WORLD, "PE", "PE", 40, 160, 0},
 	{CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PH", 40, 160, 0},
-	{CTRY_POLAND, ETSI1_WORLD, "PL", "PL", 40, 160, 0},
-	{CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PT", 40, 160, 0},
+	{CTRY_POLAND, ETSI13_WORLD, "PL", "PL", 40, 160, 0},
+	{CTRY_PORTUGAL, ETSI13_WORLD, "PT", "PT", 40, 160, 0},
 	{CTRY_PUERTO_RICO, FCC3_FCCA, "PR", "PR", 40, 160, 0},
 	{CTRY_QATAR, APL1_WORLD, "QA", "QA", 40, 160, 0},
 	{CTRY_REUNION, ETSI1_WORLD, "RE", "RE", 40, 160, 0},
-	{CTRY_ROMANIA, ETSI1_WORLD, "RO", "RO", 40, 160, 0},
+	{CTRY_ROMANIA, ETSI13_WORLD, "RO", "RO", 40, 160, 0},
 	{CTRY_RUSSIA, ETSI8_WORLD, "RU", "RU", 40, 160, 0},
 	{CTRY_RWANDA, FCC3_WORLD, "RW", "RW", 40, 160, 0},
 	{CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", "BL", 40, 160, 0},
 	{CTRY_SAINT_KITTS_AND_NEVIS, APL10_WORLD, "KN", "KN", 40, 160, 0},
 	{CTRY_SAINT_LUCIA, APL10_WORLD, "LC", "LC", 40, 160, 0},
 	{CTRY_SAINT_MARTIN, ETSI1_WORLD, "MF", "MF", 40, 160, 0},
-	{CTRY_SAINT_PIERRE_AND_MIQUELON, ETSI1_WORLD, "PM", "PM", 40, 160, 0},
-	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI1_WORLD, "VC",
+	{CTRY_SAINT_PIERRE_AND_MIQUELON, ETSI13_WORLD, "PM", "PM", 40, 160, 0},
+	{CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI13_WORLD, "VC",
 	 "VC", 40, 160, 0},
 	{CTRY_SAMOA, ETSI1_WORLD, "WS", "WS", 40, 40, 0},
 	{CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", "SA", 40, 160, 0},
 	{CTRY_SENEGAL, FCC13_WORLD, "SN", "SN", 40, 160, 0},
-	{CTRY_SERBIA, ETSI1_WORLD, "RS", "RS", 40, 160, 0},
+	{CTRY_SERBIA, ETSI13_WORLD, "RS", "RS", 40, 160, 0},
 	{CTRY_SINGAPORE, FCC3_WORLD, "SG", "SG", 40, 160, 0},
-	{CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SK", 40, 160, 0},
-	{CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SI", 40, 160, 0},
+	{CTRY_SLOVAKIA, ETSI13_WORLD, "SK", "SK", 40, 160, 0},
+	{CTRY_SLOVENIA, ETSI13_WORLD, "SI", "SI", 40, 160, 0},
 	{CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "ZA", 40, 160, 0},
-	{CTRY_SPAIN, ETSI1_WORLD, "ES", "ES", 40, 160, 0},
+	{CTRY_SPAIN, ETSI13_WORLD, "ES", "ES", 40, 160, 0},
 	{CTRY_SURINAME, ETSI1_WORLD, "SR", "SR", 40, 160, 0},
 	{CTRY_SRI_LANKA, FCC3_WORLD, "LK", "LK", 40, 20, 0},
-	{CTRY_SWEDEN, ETSI1_WORLD, "SE", "SE", 40, 160, 0},
-	{CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "CH", 40, 160, 0},
+	{CTRY_SWEDEN, ETSI13_WORLD, "SE", "SE", 40, 160, 0},
+	{CTRY_SWITZERLAND, ETSI13_WORLD, "CH", "CH", 40, 160, 0},
 	{CTRY_TAIWAN, FCC3_FCCA, "TW", "TW", 40, 160, 0},
 	{CTRY_TANZANIA, APL1_WORLD, "TZ", "TZ", 40, 160, 0},
 	{CTRY_THAILAND, FCC3_WORLD, "TH", "TH", 40, 160, 0},
 	{CTRY_TOGO, ETSI1_WORLD, "TG", "TG", 40, 40, 0},
 	{CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TT", 40, 160, 0},
 	{CTRY_TUNISIA, ETSI3_WORLD, "TN", "TN", 40, 160, 0},
-	{CTRY_TURKEY, ETSI1_WORLD, "TR", "TR", 40, 160, 0},
+	{CTRY_TURKEY, ETSI13_WORLD, "TR", "TR", 40, 160, 0},
 	{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", "TC", 40, 160, 0},
 	{CTRY_UGANDA, FCC3_WORLD, "UG", "UG", 40, 160, 0},
 	{CTRY_UKRAINE, ETSI9_WORLD, "UA", "UA", 40, 160, 0},
 	{CTRY_UAE, FCC3_WORLD, "AE", "AE", 40, 160, 0},
-	{CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "GB", 40, 160, 0},
+	{CTRY_UNITED_KINGDOM, ETSI13_WORLD, "GB", "GB", 40, 160, 0},
 	{CTRY_UNITED_STATES, FCC8_FCCA, "US", "US", 40, 160, 0},
 	{CTRY_URUGUAY, FCC2_WORLD, "UY", "UY", 40, 160, 0},
 	{CTRY_UZBEKISTAN, ETSI3_WORLD, "UZ", "UZ", 40, 160, 0},
@@ -650,6 +652,7 @@ enum reg_domains_5g {
 	FCC2,
 	FCC3,
 	FCC4,
+	FCC5,
 	FCC6,
 	FCC8,
 	FCC11,
@@ -661,6 +664,8 @@ enum reg_domains_5g {
 	ETSI8,
 	ETSI9,
 	ETSI11,
+	ETSI12,
+	ETSI13,
 	APL1,
 	APL2,
 	APL4,
@@ -714,6 +719,8 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
 	{ETSI8_WORLD, ETSI8, WORLD},
 	{ETSI9_WORLD, ETSI9, WORLD},
 	{ETSI11_WORLD, ETSI11, WORLD},
+	{ETSI12_WORLD, ETSI12, WORLD},
+	{ETSI13_WORLD, ETSI13, WORLD},
 
 	{APL1_WORLD, APL1, WORLD},
 	{APL1_ETSIC, APL1, ETSIC},
@@ -834,6 +841,7 @@ enum reg_rules_5g {
 	CHAN_5490_5730_3,
 	CHAN_5490_5730_4,
 	CHAN_5490_5730_5,
+	CHAN_5490_5730_6,
 	CHAN_5490_5710_1,
 	CHAN_5490_5710_2,
 	CHAN_5490_5710_3,
@@ -859,6 +867,7 @@ enum reg_rules_5g {
 	CHAN_5735_5875_1,
 	CHAN_5735_5875_2,
 	CHAN_5735_5875_3,
+	CHAN_5735_5875_4,
 	CHAN_5735_5815_1,
 	CHAN_5735_5775_1,
 	CHAN_5835_5855_1,
@@ -900,6 +909,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5490_5730_3] = {5490, 5730, 160, 30, 0},
 	[CHAN_5490_5730_4] = {5490, 5730, 160, 24, 0},
 	[CHAN_5490_5730_5] = {5490, 5730, 160, 30, REGULATORY_CHAN_RADAR},
+	[CHAN_5490_5730_6] = {5490, 5730, 160, 23, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_1] = {5490, 5710, 160, 30, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_2] = {5490, 5710, 160, 20, REGULATORY_CHAN_RADAR},
 	[CHAN_5490_5710_3] = {5490, 5710, 160, 27, REGULATORY_CHAN_RADAR},
@@ -925,6 +935,7 @@ const struct regulatory_rule reg_rules_5g[] = {
 	[CHAN_5735_5875_1] = {5735, 5875, 20, 27, REGULATORY_CHAN_RADAR},
 	[CHAN_5735_5875_2] = {5735, 5875, 20, 30, 0},
 	[CHAN_5735_5875_3] = {5735, 5875, 80, 30, 0},
+	[CHAN_5735_5875_4] = {5735, 5875, 80, 14, 0},
 	[CHAN_5735_5815_1] = {5735, 5815, 80, 30, 0},
 	[CHAN_5735_5775_1] = {5735, 5775, 40, 23, 0},
 	[CHAN_5835_5855_1] = {5835, 5855, 20, 30, 0},
@@ -949,6 +960,9 @@ const struct regdomain regdomains_5g[] = {
 
 	[FCC4] = {CTL_FCC, DFS_FCC_REG, 2, 6, 1, {CHAN_4940_4990_1} },
 
+	[FCC5] = {CTL_FCC, DFS_UNINIT_REG, 2, 6, 2, {CHAN_5170_5250_4,
+					      CHAN_5735_5835_2} },
+
 	[FCC6] = {CTL_FCC, DFS_FCC_REG, 2, 6, 5, {CHAN_5170_5250_5,
 					      CHAN_5250_5330_7,
 					      CHAN_5490_5590_1,
@@ -999,6 +1013,16 @@ const struct regdomain regdomains_5g[] = {
 						  CHAN_5490_5710_3,
 						  CHAN_5735_5875_1} },
 
+	[ETSI12] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_3,
+						  CHAN_5250_5330_2,
+						  CHAN_5490_5730_6,
+						  CHAN_5735_5835_1} },
+
+	[ETSI13] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_2,
+						  CHAN_5250_5330_1,
+						  CHAN_5490_5730_5,
+						  CHAN_5735_5875_4} },
+
 	[APL1] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5735_5835_2} },
 
 	[APL2] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5735_5815_1} },