qcacmn: Update Regulatory Database to 41th version

1. Change (or) Add the following country mapping to Regdomain for 6 GHz.
i) Map Full 6 GHz Reg domain HEX CODE 0x0C to FIJI
ii) Map Full 6 GHz Reg domain Hex code 02 to KENYA, MAURITIUS and MONGOLIA.
iii) Create new Full 6 GHz Reg domain Hex code 0x0D and map to ISRAEL and
KUWAIT.
iv) Create new Full 6 GHz Reg domain Hex code 0x0E and map to NEW ZEALAND,
NIUE, COOK ISLANDS
v) Map Full 6 GHz Reg domain HEX CODE 01 to ANTIGUA AND BARBUDA, ARUBA,
BAHAMAS, CAYMAN ISLANDS, DOMINICAN REPUBLIC, EL SALVADOR, JAMAICA and
VENEZUELA.
vi) Map Full 6 GHz Regdomain Hex code 0x0B to Japan.

2. Add the following regulatory database for 2.4/5 GHz and 5 GHz.
i) Create new 5 GHz Regdomain APL28 (Hex 0x1233) and Full 2 & 5 GHz
Regdomain APL28_ETSIC (0x76)
ii) Update PAKISTAN from APL1_ETSIC to APL28_ETSIC.

3. Add the following regulatory database 2.4/5 GHz and 5 GHz for Auto only
i) Create new 5 GHz Regdomain ETSI19 (Hex 0x0E45) and Full 2 & 5 GHz
Regdomain ETSI19_WORLD (0x7B)
ii) Update ISRAEL from ETSI17_WORLD to ETSI19_WORLD.

Change-Id: I8de892abdc8f446e17ccb6a039ae90ab092b6c0d
CRs-Fixed: 3287062
This commit is contained in:
Jithender Miryala
2022-09-07 13:15:56 +05:30
committed by Madan Koyyalamudi
parent 6f54fca3a9
commit c9587d7abf
2 changed files with 111 additions and 78 deletions

View File

@@ -21,7 +21,7 @@
/**
* DOC: reg_db.c
* This file implements QCA regulatory database.
* Current implementation conforms to database version 40.
* Current implementation conforms to database version 41.
*/
#include <qdf_types.h>
@@ -39,14 +39,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(AMERICAN_SAMOA, FCC3_FCCA, FCC1_6G_01, AS, 40, 160, 320, 0),
CE(ANDORRA, ETSI1_WORLD, ETSI1_6G_02, AD, 40, 160, 320, 0),
CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
CE(ANTIGUA_AND_BARBUDA, FCC17_WORLD, 0, AG, 40, 160, 0, 0),
CE(ANTIGUA_AND_BARBUDA, FCC17_WORLD, FCC1_6G_01, AG, 40, 160, 320, 0),
CE(ARGENTINA, APL16_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(ARUBA, ETSI1_WORLD, FCC1_6G_01, AW, 40, 160, 320, 0),
CE(AUSTRALIA, APL25_ETSIC, ETSI2_6G_0C, AU, 40, 160, 320, 0),
CE(AUSTRIA, ETSI1_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),
CE(BAHAMAS, FCC17_WORLD, FCC1_6G_01, BS, 40, 160, 320, 0),
CE(BAHRAIN, APL15_WORLD, 0, BH, 40, 160, 0, 0),
CE(BANGLADESH, APL1_WORLD, 0, BD, 40, 160, 0, 0),
CE(BARBADOS, FCC2_WORLD, 0, BB, 40, 160, 0, 0),
@@ -66,7 +66,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
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),
CE(CAYMAN_ISLANDS, FCC17_WORLD, 0, KY, 40, 160, 0, 0),
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, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
@@ -75,7 +75,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
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),
CE(COOK_ISLANDS, APL26_ETSIC, ETSI2_6G_0E, CK, 40, 160, 320, 0),
CE(COSTA_RICA, FCC17_WORLD, APL4_6G_11, CR, 40, 160, 320, 0),
CE(COTE_DIVOIRE, FCC17_WORLD, 0, CI, 40, 160, 0, 0),
CE(CROATIA, ETSI1_WORLD, 0, HR, 40, 160, 0, 0),
@@ -84,15 +84,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(CZECH, ETSI1_WORLD, ETSI1_6G_02, CZ, 40, 160, 320, 0),
CE(DENMARK, ETSI1_WORLD, ETSI1_6G_02, DK, 40, 160, 320, 0),
CE(DOMINICA, FCC1_FCCA, 0, DM, 40, 160, 0, 0),
CE(DOMINICAN_REPUBLIC, FCC17_FCCA, 0, DO, 40, 160, 0, 0),
CE(DOMINICAN_REPUBLIC, FCC17_FCCA, FCC1_6G_01, DO, 40, 160, 320, 0),
CE(ECUADOR, FCC17_FCCA, 0, EC, 40, 160, 0, 0),
CE(EGYPT, ETSI3_WORLD, 0, EG, 40, 160, 0, 0),
CE(EL_SALVADOR, FCC17_WORLD, 0, SV, 40, 160, 0, 0),
CE(EL_SALVADOR, FCC17_WORLD, FCC1_6G_01, SV, 40, 160, 320, 0),
CE(ESTONIA, ETSI1_WORLD, ETSI1_6G_02, EE, 40, 160, 320, 0),
CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
CE(FALKLAND_ISLANDS, ETSI1_WORLD, ETSI1_6G_02, FK, 40, 160, 320, 0),
CE(FAROE_ISLANDS, ETSI1_WORLD, ETSI1_6G_02, FO, 40, 160, 320, 0),
CE(FIJI, APL1_WORLD, 0, FJ, 40, 160, 0, 0),
CE(FIJI, APL1_WORLD, ETSI2_6G_0C, FJ, 40, 160, 320, 0),
CE(FINLAND, ETSI1_WORLD, ETSI1_6G_02, FI, 40, 160, 320, 0),
CE(FRANCE, ETSI1_WORLD, ETSI1_6G_02, FR, 40, 160, 320, 0),
CE(FRENCH_GUIANA, ETSI1_WORLD, ETSI1_6G_02, GF, 40, 160, 320, 0),
@@ -125,17 +125,17 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(IRAQ, ETSI1_WORLD, 0, IQ, 40, 160, 0, 0),
CE(IRELAND, ETSI1_WORLD, ETSI1_6G_02, IE, 40, 160, 320, 0),
CE(ISLE_OF_MAN, ETSI1_WORLD, ETSI1_6G_02, IM, 40, 160, 320, 0),
CE(ISRAEL, ETSI17_WORLD, 0, IL, 40, 160, 0, 0),
CE(ISRAEL, ETSI17_WORLD, ETSI1_6G_0D, IL, 40, 160, 320, 0),
CE(ITALY, ETSI1_WORLD, 0, IT, 40, 160, 0, 0),
CE(JAMAICA, FCC13_WORLD, 0, JM, 40, 160, 0, 0),
CE(JAPAN, MKK17_MKKC, 0, JP, 40, 160, 0, 0),
CE(JAMAICA, FCC13_WORLD, FCC1_6G_01, JM, 40, 160, 320, 0),
CE(JAPAN, MKK17_MKKC, MKK1_6G_0B, JP, 40, 160, 320, 0),
CE(JAPAN15, MKK17_MKKC, 0, JP, 40, 160, 0, 0),
CE(JERSEY, ETSI1_WORLD, ETSI1_6G_02, JE, 40, 160, 320, 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(KENYA, ETSI13_WORLD, ETSI1_6G_02, KE, 40, 160, 320, 0),
CE(KOREA_ROC, APL9_MKKC, APL1_6G_04, KR, 40, 160, 160, 0),
CE(KUWAIT, ETSI1_WORLD, 0, KW, 40, 160, 0, 0),
CE(KUWAIT, ETSI1_WORLD, ETSI1_6G_0D, KW, 40, 160, 0, 0),
CE(LAO_PEOPLES_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, FCC1_6G_05, LA, 40,
160, 320, 0),
CE(LATVIA, ETSI1_WORLD, 0, LV, 40, 160, 0, 0),
@@ -154,13 +154,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(MARSHALL_ISLANDS, FCC17_FCCA, 0, MH, 40, 160, 0, 0),
CE(MARTINIQUE, ETSI1_WORLD, ETSI1_6G_02, MQ, 40, 160, 320, 0),
CE(MAURITANIA, ETSI1_WORLD, 0, MR, 40, 160, 0, 0),
CE(MAURITIUS, ETSI1_WORLD, 0, MU, 40, 160, 0, 0),
CE(MAURITIUS, ETSI1_WORLD, ETSI1_6G_02, MU, 40, 160, 320, 0),
CE(MAYOTTE, ETSI1_WORLD, ETSI1_6G_02, YT, 40, 160, 320, 0),
CE(MEXICO, APL16_ETSIC, 0, MX, 40, 160, 0, 0),
CE(MICRONESIA, FCC17_FCCA, 0, FM, 40, 160, 0, 0),
CE(MOLDOVA, ETSI1_WORLD, 0, MD, 40, 160, 0, 0),
CE(MONACO, ETSI1_WORLD, 0, MC, 40, 160, 0, 0),
CE(MONGOLIA, FCC17_WORLD, 0, MN, 40, 160, 0, 0),
CE(MONGOLIA, FCC17_WORLD, ETSI1_6G_02, MN, 40, 160, 320, 0),
CE(MONTENEGRO, ETSI1_WORLD, 0, ME, 40, 160, 0, 0),
CE(MONTSERRAT, ETSI1_WORLD, ETSI1_6G_02, MS, 40, 160, 320, 0),
CE(MOROCCO, ETSI13_WORLD, ETSI1_6G_02, MA, 40, 160, 320, 0),
@@ -170,16 +170,16 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(NETHERLANDS, ETSI1_WORLD, ETSI1_6G_02, NL, 40, 160, 320, 0),
CE(NETHERLANDS_ANTILLES, ETSI1_WORLD, ETSI1_6G_02, AN, 40, 160, 320, 0),
CE(NEW_CALEDONIA, ETSI1_WORLD, ETSI1_6G_02, NC, 40, 160, 320, 0),
CE(NEW_ZEALAND, APL26_ETSIC, 0, NZ, 40, 160, 0, 0),
CE(NEW_ZEALAND, APL26_ETSIC, ETSI2_6G_0E, NZ, 40, 160, 320, 0),
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
CE(NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, FCC1_6G_01, MP, 40, 160, 320,
0),
CE(NICARAGUA, APL27_FCCA, 0, NI, 40, 160, 0, 0),
CE(NIUE, APL26_ETSIC, 0, NU, 40, 160, 0, 0),
CE(NIUE, APL26_ETSIC, ETSI2_6G_0E, NU, 40, 160, 320, 0),
CE(NORFOLK_ISLAND, APL25_ETSIC, ETSI2_6G_0C, NF, 40, 160, 320, 0),
CE(NORWAY, ETSI1_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),
CE(PAKISTAN, APL28_ETSIC, 0, PK, 40, 160, 0, 0),
CE(PALAU, FCC17_FCCA, 0, PW, 40, 160, 0, 0),
CE(PANAMA, FCC14_FCCB, 0, PA, 40, 160, 0, 0),
CE(PAPUA_NEW_GUINEA, FCC17_WORLD, 0, PG, 40, 160, 0, 0),
@@ -240,7 +240,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
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(VENEZUELA, FCC2_ETSIC, FCC1_6G_01, VE, 40, 160, 320, 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, ETSI1_WORLD, ETSI1_6G_02, VG, 40, 160, 320,
@@ -260,14 +260,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(AMERICAN_SAMOA, FCC3_FCCA, FCC1_6G_01, AS, 40, 160, 320, 0),
CE(ANDORRA, ETSI1_WORLD, ETSI1_6G_02, AD, 40, 160, 320, 0),
CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
CE(ANTIGUA_AND_BARBUDA, ETSI10_WORLD, 0, AG, 40, 160, 0, 0),
CE(ANTIGUA_AND_BARBUDA, ETSI10_WORLD, FCC1_6G_01, AG, 40, 160, 320, 0),
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(ARUBA, ETSI1_WORLD, FCC1_6G_01, AW, 40, 160, 320, 0),
CE(AUSTRALIA, APL25_ETSIC, ETSI2_6G_0C, AU, 40, 160, 320, 0),
CE(AUSTRIA, ETSI10_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),
CE(BAHAMAS, FCC17_WORLD, FCC1_6G_01, BS, 40, 160, 320, 0),
CE(BAHRAIN, APL15_WORLD, 0, BH, 40, 160, 0, 0),
CE(BANGLADESH, APL1_WORLD, 0, BD, 40, 160, 0, 0),
CE(BARBADOS, FCC2_WORLD, 0, BB, 40, 160, 0, 0),
@@ -287,7 +287,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(CAMBODIA, ETSI1_WORLD, 0, KH, 40, 160, 0, 0),
CE(CAMEROON, ETSI1_WORLD, 0, CM, 40, 160, 0, 0),
CE(CANADA, FCC3_FCCA, FCC1_6G_05, CA, 40, 160, 320, 0),
CE(CAYMAN_ISLANDS, FCC17_WORLD, 0, KY, 40, 160, 0, 0),
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, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
@@ -296,7 +296,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(COLOMBIA, FCC17_WORLD, 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),
CE(COOK_ISLANDS, APL26_ETSIC, ETSI2_6G_0E, CK, 40, 160, 320, 0),
CE(COSTA_RICA, FCC17_WORLD, APL4_6G_11, CR, 40, 160, 320, 0),
CE(COTE_DIVOIRE, FCC17_WORLD, 0, CI, 40, 160, 0, 0),
CE(CROATIA, ETSI10_WORLD, 0, HR, 40, 160, 0, 0),
@@ -305,15 +305,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(CZECH, ETSI10_WORLD, ETSI1_6G_02, CZ, 40, 160, 320, 0),
CE(DENMARK, ETSI10_WORLD, ETSI1_6G_02, DK, 40, 160, 320, 0),
CE(DOMINICA, FCC2_FCCA, 0, DM, 40, 160, 0, 0),
CE(DOMINICAN_REPUBLIC, FCC17_FCCA, 0, DO, 40, 160, 0, 0),
CE(DOMINICAN_REPUBLIC, FCC17_FCCA, FCC1_6G_01, DO, 40, 160, 320, 0),
CE(ECUADOR, FCC17_FCCA, 0, EC, 40, 160, 0, 0),
CE(EGYPT, ETSI3_WORLD, 0, EG, 40, 160, 0, 0),
CE(EL_SALVADOR, FCC17_WORLD, 0, SV, 40, 160, 0, 0),
CE(EL_SALVADOR, FCC17_WORLD, FCC1_6G_01, SV, 40, 160, 320, 0),
CE(ESTONIA, ETSI10_WORLD, ETSI1_6G_02, EE, 40, 160, 320, 0),
CE(ETHIOPIA, ETSI1_WORLD, 0, ET, 40, 160, 0, 0),
CE(FALKLAND_ISLANDS, ETSI10_WORLD, ETSI1_6G_02, FK, 40, 160, 320, 0),
CE(FAROE_ISLANDS, ETSI10_WORLD, ETSI1_6G_02, FO, 40, 160, 320, 0),
CE(FIJI, APL1_WORLD, 0, FJ, 40, 160, 0, 0),
CE(FIJI, APL1_WORLD, ETSI2_6G_0C, FJ, 40, 160, 320, 0),
CE(FINLAND, ETSI10_WORLD, ETSI1_6G_02, FI, 40, 160, 320, 0),
CE(FRANCE, ETSI10_WORLD, ETSI1_6G_02, FR, 40, 160, 320, 0),
CE(FRENCH_GUIANA, ETSI10_WORLD, ETSI1_6G_02, GF, 40, 160, 320, 0),
@@ -346,18 +346,18 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(IRAQ, ETSI1_WORLD, 0, IQ, 40, 160, 0, 0),
CE(IRELAND, ETSI10_WORLD, ETSI1_6G_02, IE, 40, 160, 320, 0),
CE(ISLE_OF_MAN, ETSI10_WORLD, ETSI1_6G_02, IM, 40, 160, 320, 0),
CE(ISRAEL, ETSI3_WORLD, 0, IL, 40, 160, 0, 0),
CE(ISRAEL, ETSI3_WORLD, ETSI1_6G_0D, IL, 40, 160, 320, 0),
CE(ITALY, ETSI10_WORLD, 0, IT, 40, 160, 0, 0),
CE(JAMAICA, FCC13_WORLD, 0, JM, 40, 160, 0, 0),
CE(JAPAN, MKK17_MKKC, 0, JP, 40, 160, 0, 0),
CE(JAMAICA, FCC13_WORLD, FCC1_6G_01, JM, 40, 160, 320, 0),
CE(JAPAN, MKK17_MKKC, MKK1_6G_0B, JP, 40, 160, 320, 0),
CE(JAPAN15, MKK5_MKKC, 0, JP, 40, 160, 0, 0),
CE(XA, MKK5_MKKA, 0, XA, 40, 160, 0, 0),
CE(JERSEY, ETSI10_WORLD, ETSI1_6G_02, JE, 40, 160, 320, 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(KENYA, ETSI13_WORLD, ETSI1_6G_02, KE, 40, 160, 320, 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(KUWAIT, ETSI13_WORLD, ETSI1_6G_0D, KW, 40, 160, 0, 0),
CE(LAO_PEOPLES_DEMOCRATIC_REPUBLIC, ETSI13_WORLD, FCC1_6G_05, LA, 40,
160, 320, 0),
CE(LATVIA, ETSI10_WORLD, 0, LV, 40, 160, 0, 0),
@@ -376,13 +376,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(MARSHALL_ISLANDS, FCC17_FCCA, 0, MH, 40, 160, 0, 0),
CE(MARTINIQUE, ETSI10_WORLD, ETSI1_6G_02, MQ, 40, 160, 320, 0),
CE(MAURITANIA, ETSI1_WORLD, 0, MR, 40, 160, 0, 0),
CE(MAURITIUS, ETSI13_WORLD, 0, MU, 40, 160, 0, 0),
CE(MAURITIUS, ETSI13_WORLD, ETSI1_6G_02, MU, 40, 160, 320, 0),
CE(MAYOTTE, ETSI1_WORLD, ETSI1_6G_02, YT, 40, 160, 320, 0),
CE(MEXICO, APL16_ETSIC, 0, MX, 40, 160, 0, 0),
CE(MICRONESIA, FCC17_FCCA, 0, FM, 40, 160, 0, 0),
CE(MOLDOVA, ETSI13_WORLD, 0, MD, 40, 160, 0, 0),
CE(MONACO, ETSI10_WORLD, 0, MC, 40, 160, 0, 0),
CE(MONGOLIA, FCC17_WORLD, 0, MN, 40, 160, 0, 0),
CE(MONGOLIA, FCC17_WORLD, ETSI1_6G_02, MN, 40, 160, 320, 0),
CE(MONTENEGRO, ETSI10_WORLD, 0, ME, 40, 160, 0, 0),
CE(MONTSERRAT, ETSI10_WORLD, ETSI1_6G_02, MS, 40, 160, 320, 0),
CE(MOROCCO, ETSI13_WORLD, ETSI1_6G_02, MA, 40, 160, 320, 0),
@@ -393,16 +393,16 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(NETHERLANDS_ANTILLES, ETSI10_WORLD, ETSI1_6G_02, AN, 40, 160, 320,
0),
CE(NEW_CALEDONIA, ETSI10_WORLD, ETSI1_6G_02, NC, 40, 160, 320, 0),
CE(NEW_ZEALAND, APL26_ETSIC, 0, NZ, 40, 160, 0, 0),
CE(NEW_ZEALAND, APL26_ETSIC, ETSI2_6G_0E, NZ, 40, 160, 320, 0),
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
CE(NORTHERN_MARIANA_ISLANDS, FCC10_FCCA, FCC1_6G_01, MP, 40, 160, 320,
0),
CE(NICARAGUA, APL27_FCCA, 0, NI, 40, 160, 0, 0),
CE(NIUE, ETSI10_WORLD, 0, NU, 40, 160, 0, 0),
CE(NIUE, ETSI10_WORLD, ETSI2_6G_0E, NU, 40, 160, 320, 0),
CE(NORFOLK_ISLAND, APL25_ETSIC, ETSI2_6G_0C, NF, 40, 160, 320, 0),
CE(NORWAY, ETSI10_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),
CE(PAKISTAN, APL28_ETSIC, 0, PK, 40, 160, 0, 0),
CE(PALAU, FCC17_FCCA, 0, PW, 40, 160, 0, 0),
CE(PANAMA, FCC14_FCCB, 0, PA, 40, 160, 0, 0),
CE(PAPUA_NEW_GUINEA, FCC17_WORLD, 0, PG, 40, 160, 0, 0),
@@ -463,7 +463,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
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(VENEZUELA, FCC2_ETSIC, FCC1_6G_01, VE, 40, 160, 320, 0),
CE(VIET_NAM, ETSI15_WORLD, 0, VN, 40, 160, 0, 0),
CE(VIRGIN_ISLANDS, FCC10_FCCA, FCC1_6G_01, VI, 40, 160, 320, 0),
CE(VIRGIN_ISLANDS_BRITISH, ETSI10_WORLD, ETSI1_6G_02, VG, 40, 160, 320,
@@ -482,14 +482,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(AMERICAN_SAMOA, FCC3_FCCA, FCC1_6G_01, AS, 40, 160, 320, 0),
CE(ANDORRA, ETSI13_WORLD, ETSI1_6G_02, AD, 40, 160, 320, 0),
CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
CE(ANTIGUA_AND_BARBUDA, FCC17_WORLD, 0, AG, 40, 160, 0, 0),
CE(ANTIGUA_AND_BARBUDA, FCC17_WORLD, FCC1_6G_01, AG, 40, 160, 320, 0),
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(ARUBA, ETSI1_WORLD, FCC1_6G_01, AW, 40, 160, 320, 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),
CE(BAHAMAS, FCC17_WORLD, FCC1_6G_01, BS, 40, 160, 320, 0),
CE(BAHRAIN, APL15_WORLD, 0, BH, 40, 160, 0, 0),
CE(BANGLADESH, APL1_WORLD, 0, BD, 40, 160, 0, 0),
CE(BARBADOS, FCC2_WORLD, 0, BB, 40, 160, 0, 0),
@@ -509,7 +509,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
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),
CE(CAYMAN_ISLANDS, FCC17_WORLD, 0, KY, 40, 160, 0, 0),
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, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
@@ -518,7 +518,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
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),
CE(COOK_ISLANDS, APL26_ETSIC, ETSI2_6G_0E, CK, 40, 160, 320, 0),
CE(COSTA_RICA, FCC17_WORLD, APL4_6G_11, CR, 40, 160, 320, 0),
CE(COTE_DIVOIRE, FCC17_WORLD, 0, CI, 40, 160, 0, 0),
CE(CROATIA, ETSI13_WORLD, 0, HR, 40, 160, 0, 0),
@@ -527,15 +527,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(CZECH, ETSI13_WORLD, ETSI1_6G_02, CZ, 40, 160, 320, 0),
CE(DENMARK, ETSI13_WORLD, ETSI1_6G_02, DK, 40, 160, 320, 0),
CE(DOMINICA, FCC2_FCCA, 0, DM, 40, 160, 0, 0),
CE(DOMINICAN_REPUBLIC, FCC17_FCCA, 0, DO, 40, 160, 0, 0),
CE(DOMINICAN_REPUBLIC, FCC17_FCCA, FCC1_6G_01, DO, 40, 160, 320, 0),
CE(ECUADOR, FCC17_FCCA, 0, EC, 40, 160, 0, 0),
CE(EGYPT, ETSI3_WORLD, 0, EG, 40, 160, 0, 0),
CE(EL_SALVADOR, FCC17_WORLD, 0, SV, 40, 160, 0, 0),
CE(EL_SALVADOR, FCC17_WORLD, FCC1_6G_01, SV, 40, 160, 320, 0),
CE(ESTONIA, ETSI13_WORLD, ETSI1_6G_02, EE, 40, 160, 320, 0),
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(FIJI, APL1_WORLD, ETSI2_6G_0C, FJ, 40, 160, 320, 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),
@@ -568,18 +568,18 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(IRAQ, ETSI1_WORLD, 0, IQ, 40, 160, 0, 0),
CE(IRELAND, ETSI13_WORLD, ETSI1_6G_02, IE, 40, 160, 320, 0),
CE(ISLE_OF_MAN, ETSI13_WORLD, ETSI1_6G_02, IM, 40, 160, 320, 0),
CE(ISRAEL, ETSI17_WORLD, 0, IL, 40, 160, 0, 0),
CE(ISRAEL, ETSI19_WORLD, ETSI1_6G_0D, IL, 40, 160, 320, 0),
CE(ITALY, ETSI13_WORLD, 0, IT, 40, 160, 0, 0),
CE(JAMAICA, FCC13_WORLD, 0, JM, 40, 160, 0, 0),
CE(JAPAN, MKK17_MKKC, 0, JP, 40, 160, 0, 0),
CE(JAMAICA, FCC13_WORLD, FCC1_6G_01, JM, 40, 160, 320, 0),
CE(JAPAN, MKK17_MKKC, MKK1_6G_0B, JP, 40, 160, 320, 0),
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, 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(KENYA, ETSI13_WORLD, ETSI1_6G_02, KE, 40, 160, 320, 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(KUWAIT, ETSI13_WORLD, ETSI1_6G_0D, KW, 40, 160, 320, 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),
@@ -598,13 +598,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(MARSHALL_ISLANDS, FCC17_FCCA, 0, MH, 40, 160, 0, 0),
CE(MARTINIQUE, ETSI13_WORLD, ETSI1_6G_02, MQ, 40, 160, 320, 0),
CE(MAURITANIA, ETSI1_WORLD, 0, MR, 40, 160, 0, 0),
CE(MAURITIUS, ETSI13_WORLD, 0, MU, 40, 160, 0, 0),
CE(MAURITIUS, ETSI13_WORLD, ETSI1_6G_02, MU, 40, 160, 320, 0),
CE(MAYOTTE, ETSI1_WORLD, ETSI1_6G_02, YT, 40, 160, 320, 0),
CE(MEXICO, APL16_ETSIC, 0, MX, 40, 160, 0, 0),
CE(MICRONESIA, FCC17_FCCA, 0, FM, 40, 160, 0, 0),
CE(MOLDOVA, ETSI13_WORLD, 0, MD, 40, 160, 0, 0),
CE(MONACO, ETSI13_WORLD, 0, MC, 40, 160, 0, 0),
CE(MONGOLIA, FCC17_WORLD, 0, MN, 40, 160, 0, 0),
CE(MONGOLIA, FCC17_WORLD, ETSI1_6G_02, MN, 40, 160, 320, 0),
CE(MONTENEGRO, ETSI13_WORLD, 0, ME, 40, 160, 0, 0),
CE(MONTSERRAT, ETSI13_WORLD, ETSI1_6G_02, MS, 40, 160, 320, 0),
CE(MOROCCO, ETSI13_WORLD, ETSI1_6G_02, MA, 40, 160, 320, 0),
@@ -615,16 +615,16 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(NETHERLANDS_ANTILLES, ETSI13_WORLD, ETSI1_6G_02, AN, 40, 160, 320,
0),
CE(NEW_CALEDONIA, ETSI13_WORLD, ETSI1_6G_02, NC, 40, 160, 320, 0),
CE(NEW_ZEALAND, APL26_ETSIC, 0, NZ, 40, 160, 0, 0),
CE(NEW_ZEALAND, APL26_ETSIC, ETSI2_6G_0E, NZ, 40, 160, 320, 0),
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
CE(NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, FCC1_6G_01, MP, 40, 160, 320,
0),
CE(NICARAGUA, APL27_FCCA, 0, NI, 40, 160, 0, 0),
CE(NIUE, APL26_ETSIC, 0, NU, 40, 160, 0, 0),
CE(NIUE, APL26_ETSIC, ETSI2_6G_0E, NU, 40, 160, 320, 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),
CE(PAKISTAN, APL28_ETSIC, 0, PK, 40, 160, 0, 0),
CE(PALAU, FCC17_FCCA, 0, PW, 40, 160, 0, 0),
CE(PANAMA, FCC14_FCCB, 0, PA, 40, 160, 0, 0),
CE(PAPUA_NEW_GUINEA, FCC17_WORLD, 0, PG, 40, 160, 0, 0),
@@ -685,7 +685,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
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(VENEZUELA, FCC2_ETSIC, FCC1_6G_01, VE, 40, 160, 320, 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,
@@ -704,14 +704,14 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(AMERICAN_SAMOA, FCC3_FCCA, FCC1_6G_01, AS, 40, 160, 320, 0),
CE(ANDORRA, ETSI13_WORLD, ETSI1_6G_02, AD, 40, 160, 320, 0),
CE(ANGUILLA, ETSI1_WORLD, 0, AI, 40, 160, 0, 0),
CE(ANTIGUA_AND_BARBUDA, FCC17_WORLD, 0, AG, 40, 160, 0, 0),
CE(ANTIGUA_AND_BARBUDA, FCC17_WORLD, FCC1_6G_01, AG, 40, 160, 320, 0),
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(ARUBA, ETSI1_WORLD, FCC1_6G_01, AW, 40, 160, 320, 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),
CE(BAHAMAS, FCC17_WORLD, FCC1_6G_01, BS, 40, 160, 320, 0),
CE(BAHRAIN, APL15_WORLD, 0, BH, 40, 160, 0, 0),
CE(BANGLADESH, APL1_WORLD, 0, BD, 40, 160, 0, 0),
CE(BARBADOS, FCC2_WORLD, 0, BB, 40, 160, 0, 0),
@@ -731,7 +731,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
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),
CE(CAYMAN_ISLANDS, FCC17_WORLD, 0, KY, 40, 160, 0, 0),
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, FCC13_WORLD, APL5_6G_12, CL, 40, 160, 320, 0),
@@ -740,7 +740,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
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),
CE(COOK_ISLANDS, APL26_ETSIC, ETSI2_6G_0E, CK, 40, 160, 320, 0),
CE(COSTA_RICA, FCC17_WORLD, APL4_6G_11, CR, 40, 160, 320, 0),
CE(COTE_DIVOIRE, FCC17_WORLD, 0, CI, 40, 160, 0, 0),
CE(CROATIA, ETSI13_WORLD, 0, HR, 40, 160, 0, 0),
@@ -749,15 +749,15 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(CZECH, ETSI13_WORLD, ETSI1_6G_02, CZ, 40, 160, 320, 0),
CE(DENMARK, ETSI13_WORLD, ETSI1_6G_02, DK, 40, 160, 320, 0),
CE(DOMINICA, FCC2_FCCA, 0, DM, 40, 160, 0, 0),
CE(DOMINICAN_REPUBLIC, FCC17_FCCA, 0, DO, 40, 160, 0, 0),
CE(DOMINICAN_REPUBLIC, FCC17_FCCA, FCC1_6G_01, DO, 40, 160, 320, 0),
CE(ECUADOR, FCC17_FCCA, 0, EC, 40, 160, 0, 0),
CE(EGYPT, ETSI3_WORLD, 0, EG, 40, 160, 0, 0),
CE(EL_SALVADOR, FCC17_WORLD, 0, SV, 40, 160, 0, 0),
CE(EL_SALVADOR, FCC17_WORLD, FCC1_6G_01, SV, 40, 160, 320, 0),
CE(ESTONIA, ETSI13_WORLD, ETSI1_6G_02, EE, 40, 160, 320, 0),
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(FIJI, APL1_WORLD, ETSI2_6G_0C, FJ, 40, 160, 320, 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),
@@ -790,18 +790,18 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(IRAQ, ETSI1_WORLD, 0, IQ, 40, 160, 0, 0),
CE(IRELAND, ETSI13_WORLD, ETSI1_6G_02, IE, 40, 160, 320, 0),
CE(ISLE_OF_MAN, ETSI13_WORLD, ETSI1_6G_02, IM, 40, 160, 320, 0),
CE(ISRAEL, ETSI17_WORLD, 0, IL, 40, 160, 0, 0),
CE(ISRAEL, ETSI17_WORLD, ETSI1_6G_0D, IL, 40, 160, 320, 0),
CE(ITALY, ETSI13_WORLD, 0, IT, 40, 160, 0, 0),
CE(JAMAICA, FCC13_WORLD, 0, JM, 40, 160, 0, 0),
CE(JAPAN, MKK17_MKKC, 0, JP, 40, 160, 0, 0),
CE(JAMAICA, FCC13_WORLD, FCC1_6G_01, JM, 40, 160, 320, 0),
CE(JAPAN, MKK17_MKKC, MKK1_6G_0B, JP, 40, 160, 320, 0),
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, 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(KENYA, ETSI13_WORLD, ETSI1_6G_02, KE, 40, 160, 320, 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(KUWAIT, ETSI13_WORLD, ETSI1_6G_0D, 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),
@@ -820,13 +820,13 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(MARSHALL_ISLANDS, FCC17_FCCA, 0, MH, 40, 160, 0, 0),
CE(MARTINIQUE, ETSI13_WORLD, ETSI1_6G_02, MQ, 40, 160, 320, 0),
CE(MAURITANIA, ETSI1_WORLD, 0, MR, 40, 160, 0, 0),
CE(MAURITIUS, ETSI13_WORLD, 0, MU, 40, 160, 0, 0),
CE(MAURITIUS, ETSI13_WORLD, ETSI1_6G_02, MU, 40, 160, 320, 0),
CE(MAYOTTE, ETSI1_WORLD, ETSI1_6G_02, YT, 40, 160, 320, 0),
CE(MEXICO, APL16_ETSIC, 0, MX, 40, 160, 0, 0),
CE(MICRONESIA, FCC17_FCCA, 0, FM, 40, 160, 0, 0),
CE(MOLDOVA, ETSI13_WORLD, 0, MD, 40, 160, 0, 0),
CE(MONACO, ETSI13_WORLD, 0, MC, 40, 160, 0, 0),
CE(MONGOLIA, FCC17_WORLD, 0, MN, 40, 160, 0, 0),
CE(MONGOLIA, FCC17_WORLD, ETSI1_6G_02, MN, 40, 160, 320, 0),
CE(MONTENEGRO, ETSI13_WORLD, 0, ME, 40, 160, 0, 0),
CE(MONTSERRAT, ETSI13_WORLD, ETSI1_6G_02, MS, 40, 160, 320, 0),
CE(MOROCCO, ETSI13_WORLD, ETSI1_6G_02, MA, 40, 160, 320, 0),
@@ -837,16 +837,16 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(NETHERLANDS_ANTILLES, ETSI13_WORLD, ETSI1_6G_02, AN, 40, 160, 320,
0),
CE(NEW_CALEDONIA, ETSI13_WORLD, ETSI1_6G_02, NC, 40, 160, 320, 0),
CE(NEW_ZEALAND, APL26_ETSIC, 0, NZ, 40, 160, 0, 0),
CE(NEW_ZEALAND, APL26_ETSIC, ETSI2_6G_0E, NZ, 40, 160, 320, 0),
CE(NIGERIA, APL6_WORLD, 0, NG, 40, 160, 0, 0),
CE(NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, FCC1_6G_01, MP, 40, 160, 320,
0),
CE(NICARAGUA, APL27_FCCA, 0, NI, 40, 160, 0, 0),
CE(NIUE, APL26_ETSIC, 0, NU, 40, 160, 0, 0),
CE(NIUE, APL26_ETSIC, ETSI2_6G_0E, NU, 40, 160, 320, 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),
CE(PAKISTAN, APL28_ETSIC, 0, PK, 40, 160, 0, 0),
CE(PALAU, FCC17_FCCA, 0, PW, 40, 160, 0, 0),
CE(PANAMA, FCC14_FCCB, 0, PA, 40, 160, 0, 0),
CE(PAPUA_NEW_GUINEA, FCC17_WORLD, 0, PG, 40, 160, 0, 0),
@@ -907,7 +907,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
CE(URUGUAY, FCC2_WORLD, 0, UY, 40, 160, 0, 0),
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(VENEZUELA, FCC2_ETSIC, FCC1_6G_01, VE, 40, 160, 320, 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,
@@ -964,6 +964,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
{ETSI16_WORLD, ETSI16, WORLD},
{ETSI17_WORLD, ETSI17, WORLD},
{ETSI18_WORLD, ETSI18, WORLD},
{ETSI19_WORLD, ETSI19, WORLD},
{APL1_WORLD, APL1, WORLD},
{APL1_ETSIC, APL1, ETSIC},
@@ -994,6 +995,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
{APL25_ETSIC, APL25, ETSIC},
{APL26_ETSIC, APL26, ETSIC},
{APL27_FCCA, APL27, FCCA},
{APL28_ETSIC, APL28, ETSIC},
{MKK3_MKKC, MKK3, MKKC},
{MKK5_MKKA, MKK5, MKKA},
@@ -1155,6 +1157,7 @@ enum reg_rules_5g {
CHAN_5735_5875_5,
CHAN_5735_5875_6,
CHAN_5735_5875_7,
CHAN_5735_5875_8,
CHAN_5735_5815_1,
CHAN_5735_5815_2,
CHAN_5735_5815_3,
@@ -1262,6 +1265,7 @@ const struct regulatory_rule reg_rules_5g[] = {
[CHAN_5735_5875_5] = {5735, 5875, 80, 20, REGULATORY_CHAN_RADAR},
[CHAN_5735_5875_6] = {5735, 5875, 80, 23, REGULATORY_CHAN_INDOOR_ONLY},
[CHAN_5735_5875_7] = {5735, 5875, 80, 14, REGULATORY_CHAN_RADAR},
[CHAN_5735_5875_8] = {5735, 5875, 80, 30, REGULATORY_CHAN_RADAR},
[CHAN_5735_5815_1] = {5735, 5815, 80, 30, 0},
[CHAN_5735_5815_2] = {5735, 5815, 80, 30, REGULATORY_CHAN_RADAR},
[CHAN_5735_5815_3] = {5735, 5815, 80, 23, REGULATORY_CHAN_INDOOR_ONLY},
@@ -1446,6 +1450,13 @@ const struct regdomain regdomains_5g[] = {
CHAN_5735_5875_7}
},
[ETSI19] = {CTL_ETSI, DFS_ETSI_REGION, 2, 160, 0, 5, {CHAN_5170_5250_11,
CHAN_5250_5330_12,
CHAN_5490_5710_9,
CHAN_5735_5835_10,
CHAN_5835_5855_2}
},
[APL1] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 80, 0, 1, {CHAN_5735_5835_2}
},
@@ -1545,6 +1556,11 @@ const struct regdomain regdomains_5g[] = {
CHAN_5490_5730_4,
CHAN_5735_5835_2} },
[APL28] = {CTL_ETSI, DFS_ETSI_REGION, 2, 320, 0, 3, {CHAN_5170_5330_3,
CHAN_5490_5730_6,
CHAN_5735_5875_8}
},
[MKK3] = {CTL_MKK, DFS_UNINIT_REGION, 2, 80, 0, 1, {CHAN_5170_5250_3} },
[MKK5] = {CTL_MKK, DFS_MKK_REGION, 2, 160, 0, 3, {CHAN_5170_5250_8,
@@ -1689,6 +1705,14 @@ static const struct sixghz_super_to_subdomains g_6g_reg_dmn_9_tuples[] = {
{ETSI2_CLI_LPI_6G, ETSI2_CLI_LPI_6G},
{0, 0},
{ETSI1_CLI_VLP_6G, ETSI1_CLI_VLP_6G} },
{ETSI1_6G_0D, ETSI1_AP_LPI_6G, 0, 0,
{ETSI1_CLI_LPI_6G, ETSI1_CLI_LPI_6G},
{0, 0},
{0, 0} },
{ETSI2_6G_0E, ETSI2_AP_LPI_6G, 0, ETSI1_AP_VLP_6G,
{ETSI2_CLI_LPI_6G, ETSI2_CLI_LPI_6G},
{0, 0},
{ETSI1_CLI_VLP_6G, ETSI1_CLI_VLP_6G} },
{FCC2_6G_10, FCC1_AP_LPI_6G, FCC2_AP_SP_6G, 0,
{FCC1_CLI_LPI_DEFAULT_6G, 0},
{FCC2_CLI_SP_6G, FCC2_CLI_SP_6G},
@@ -1969,6 +1993,7 @@ const uint32_t reg_5g_sub_dmn_code[REG_DOMAINS_5G_MAX] = {
[ETSI14] = 0x0E40,
[ETSI15] = 0x0E41,
[ETSI18] = 0x0E44,
[ETSI19] = 0x0E45,
[APL1] = 0x0150,
[APL2] = 0x0250,
[APL4] = 0x0450,
@@ -1983,9 +2008,9 @@ const uint32_t reg_5g_sub_dmn_code[REG_DOMAINS_5G_MAX] = {
[APL15] = 0x1190,
[APL16] = 0x1200,
[APL17] = 0x1210,
[APL23] = 0x1280,
[APL20] = 0x1250,
[APL23] = 0x1280,
[APL28] = 0x1233,
[MKK3] = 0x0340,
[MKK5] = 0x0540,
[MKK11] = 0x1140,

View File

@@ -108,6 +108,7 @@ enum reg_domain {
ETSI16_WORLD = 0x4A,
ETSI17_WORLD = 0x4B,
ETSI18_WORLD = 0x3D,
ETSI19_WORLD = 0x7B,
APL1_WORLD = 0x52,
APL1_ETSIC = 0x55,
@@ -140,6 +141,7 @@ enum reg_domain {
APL25_ETSIC = 0x75,
APL26_ETSIC = 0x72,
APL27_FCCA = 0x73,
APL28_ETSIC = 0x76,
WOR0_WORLD = 0x60,
WOR1_WORLD = 0x61,
@@ -242,6 +244,7 @@ enum reg_domains_5g {
ETSI16,
ETSI17,
ETSI18,
ETSI19,
APL1,
APL2,
@@ -267,6 +270,7 @@ enum reg_domains_5g {
APL25,
APL26,
APL27,
APL28,
MKK3,
MKK5,
@@ -637,6 +641,8 @@ struct reg_domain_pair {
* @APL6_6G_0A: Super domain APL6_6G_0A for Saudi Arabia LPI STA and AP
* @MKK1_6G_0B: Super domain MKK1_6G_0B for Japan LPI and VLP
* @ETSI2_6G_0C: Super domain ETSI2_6G_0C for Australia LPI and VLP
* @ETSI2_6G_0D: Super domain ETSI2_6G_0D for ISRAEL LPI
* @ETSI2_6G_0E: Super domain ETSI2_6G_0E for NEW ZEALAND LPI and VLP
* @FCC2_6G_10: Super domain FCC1_6G_10 for Canada LPI &
SP(VLP to be added later)
* @APL4_6G_11: Super domain APL3_6G_11 for Costa Rica LPI and VLP
@@ -655,6 +661,8 @@ enum reg_super_domain_6g {
APL6_6G_0A = 0x0A,
MKK1_6G_0B = 0x0B,
ETSI2_6G_0C = 0x0C,
ETSI1_6G_0D = 0x0D,
ETSI2_6G_0E = 0x0E,
FCC2_6G_10 = 0x10,
APL4_6G_11 = 0x11,
APL5_6G_12 = 0x12,