qcacmn: Update regulatory database to version 34
1) Map Chile to FCC2_6G (Hex Code 0x05) for 6G, and to FCC14_World for 2G/5G. 2) Map San Marino to ETSI1 for WIN and DSRC, and to ETSI13_World for MCC. 3) Map UAE to ETSI13_World for WIN and MCC. 4) Add hexcodes for 6G sub domains. Change-Id: I1627f2e739ad7b862e684673c36de7a823dcb714 CRs-Fixed: 2857528
Este cometimento está contido em:

cometido por
Gerrit - the friendly Code Review server

ascendente
02d0594adf
cometimento
cded00d118
@@ -20,7 +20,7 @@
|
||||
/**
|
||||
* DOC: reg_db.c
|
||||
* This file implements QCA regulatory database.
|
||||
* Current implementation conforms to database version 33.
|
||||
* Current implementation conforms to database version 34.
|
||||
*/
|
||||
|
||||
#include <qdf_types.h>
|
||||
@@ -253,6 +253,7 @@ enum reg_domain {
|
||||
FCC11_WORLD = 0x19,
|
||||
FCC13_WORLD = 0xE4,
|
||||
FCC14_FCCB = 0xE6,
|
||||
FCC14_WORLD = 0xD1,
|
||||
FCC15_FCCA = 0xEA,
|
||||
FCC16_FCCA = 0xE8,
|
||||
|
||||
@@ -355,7 +356,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
||||
CE(CAYMAN_ISLANDS, FCC3_WORLD, 0, KY, 40, 160, 0, 0),
|
||||
CE(CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, 0, CF, 40, 40, 0, 0),
|
||||
CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
|
||||
CE(CHILE, FCC13_WORLD, 0, CL, 40, 160, 0, 0),
|
||||
CE(CHILE, FCC14_WORLD, FCC1_6G_CL, CL, 40, 160, 160, 0),
|
||||
CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
|
||||
CE(CHRISTMAS_ISLAND, FCC3_WORLD, 0, CX, 40, 160, 0, 0),
|
||||
CE(COLOMBIA, FCC3_WORLD, 0, CO, 40, 160, 0, 0),
|
||||
@@ -480,7 +481,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
||||
CE(SAINT_VINCENT_AND_THE_GRENADIENS, ETSI1_WORLD, 0, VC,
|
||||
40, 160, 0, 0),
|
||||
CE(SAMOA, ETSI1_WORLD, 0, WS, 40, 40, 0, 0),
|
||||
CE(SAN_MARINO, FCC3_FCCA, 0, SM, 40, 160, 0, 0),
|
||||
CE(SAN_MARINO, ETSI1_WORLD, 0, SM, 40, 160, 0, 0),
|
||||
CE(SAO_TOME_AND_PRINCIPE, FCC3_WORLD, 0, ST, 40, 160, 0, 0),
|
||||
CE(SAUDI_ARABIA, ETSI15_WORLD, 0, SA, 40, 160, 0, 0),
|
||||
CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
|
||||
@@ -506,7 +507,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
||||
CE(TURKS_AND_CAICOS, FCC3_WORLD, 0, TC, 40, 160, 0, 0),
|
||||
CE(UGANDA, FCC3_WORLD, 0, UG, 40, 160, 0, 0),
|
||||
CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
|
||||
CE(UAE, FCC3_WORLD, 0, AE, 40, 160, 0, 0),
|
||||
CE(UAE, ETSI13_WORLD, 0, AE, 40, 160, 0, 0),
|
||||
CE(UNITED_KINGDOM, ETSI1_WORLD, ETSI2_6G, GB, 40, 160, 160, 0),
|
||||
CE(UNITED_STATES, FCC8_FCCA, FCC1_6G, US, 40, 160, 160, 0),
|
||||
CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC8_FCCA, 0, UM, 40, 160, 0,
|
||||
@@ -560,7 +561,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
||||
CE(CAYMAN_ISLANDS, FCC3_WORLD, 0, KY, 40, 160, 0, 0),
|
||||
CE(CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, 0, CF, 40, 40, 0, 0),
|
||||
CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
|
||||
CE(CHILE, FCC13_WORLD, 0, CL, 40, 160, 0, 0),
|
||||
CE(CHILE, FCC14_WORLD, FCC1_6G_CL, CL, 40, 160, 160, 0),
|
||||
CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
|
||||
CE(CHRISTMAS_ISLAND, FCC3_WORLD, 0, CX, 40, 160, 0, 0),
|
||||
CE(COLOMBIA, FCC3_WORLD, 0, CO, 40, 160, 0, 0),
|
||||
@@ -686,7 +687,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
||||
CE(SAINT_VINCENT_AND_THE_GRENADIENS, ETSI13_WORLD, 0, VC,
|
||||
40, 160, 0, 0),
|
||||
CE(SAMOA, ETSI1_WORLD, 0, WS, 40, 40, 0, 0),
|
||||
CE(SAN_MARINO, FCC3_FCCA, 0, SM, 40, 160, 0, 0),
|
||||
CE(SAN_MARINO, ETSI1_WORLD, 0, SM, 40, 160, 0, 0),
|
||||
CE(SAO_TOME_AND_PRINCIPE, FCC3_WORLD, 0, ST, 40, 160, 0, 0),
|
||||
CE(SAUDI_ARABIA, ETSI15_WORLD, 0, SA, 40, 160, 0, 0),
|
||||
CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
|
||||
@@ -765,7 +766,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
||||
CE(CAYMAN_ISLANDS, FCC3_WORLD, 0, KY, 40, 160, 0, 0),
|
||||
CE(CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, 0, CF, 40, 40, 0, 0),
|
||||
CE(CHAD, ETSI1_WORLD, 0, TD, 40, 160, 0, 0),
|
||||
CE(CHILE, FCC13_WORLD, 0, CL, 40, 160, 0, 0),
|
||||
CE(CHILE, FCC14_WORLD, FCC1_6G_CL, CL, 40, 160, 160, 0),
|
||||
CE(CHINA, APL14_WORLD, 0, CN, 40, 160, 0, 0),
|
||||
CE(CHRISTMAS_ISLAND, FCC3_WORLD, 0, CX, 40, 160, 0, 0),
|
||||
CE(COLOMBIA, FCC3_WORLD, 0, CO, 40, 160, 0, 0),
|
||||
@@ -891,7 +892,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
||||
CE(SAINT_VINCENT_AND_THE_GRENADIENS, ETSI13_WORLD, 0, VC,
|
||||
40, 160, 0, 0),
|
||||
CE(SAMOA, ETSI1_WORLD, 0, WS, 40, 40, 0, 0),
|
||||
CE(SAN_MARINO, FCC3_FCCA, 0, SM, 40, 160, 0, 0),
|
||||
CE(SAN_MARINO, ETSI13_WORLD, 0, SM, 40, 160, 0, 0),
|
||||
CE(SAO_TOME_AND_PRINCIPE, FCC3_WORLD, 0, ST, 40, 160, 0, 0),
|
||||
CE(SAUDI_ARABIA, ETSI15_WORLD, 0, SA, 40, 160, 0, 0),
|
||||
CE(SENEGAL, FCC13_WORLD, 0, SN, 40, 160, 0, 0),
|
||||
@@ -917,7 +918,7 @@ const struct country_code_to_reg_domain g_all_countries[] = {
|
||||
CE(TURKS_AND_CAICOS, FCC3_WORLD, 0, TC, 40, 160, 0, 0),
|
||||
CE(UGANDA, FCC3_WORLD, 0, UG, 40, 160, 0, 0),
|
||||
CE(UKRAINE, ETSI9_WORLD, 0, UA, 40, 160, 0, REGULATORY_PHYMODE_NO11AX),
|
||||
CE(UAE, FCC3_WORLD, 0, AE, 40, 160, 0, 0),
|
||||
CE(UAE, ETSI13_WORLD, 0, AE, 40, 160, 0, 0),
|
||||
CE(UNITED_KINGDOM, ETSI1_WORLD, ETSI2_6G, GB, 40, 160, 160, 0),
|
||||
CE(UNITED_STATES, FCC8_FCCA, FCC1_6G, US, 40, 160, 160, 0),
|
||||
CE(UNITED_STATES_MINOR_OUTLYING_ISLANDS, FCC3_FCCA, 0, UM, 40, 160, 0,
|
||||
@@ -1033,6 +1034,7 @@ const struct reg_domain_pair g_reg_dmn_pairs[] = {
|
||||
{FCC11_WORLD, FCC11, WORLD},
|
||||
{FCC13_WORLD, FCC13, WORLD},
|
||||
{FCC14_FCCB, FCC14, FCCB},
|
||||
{FCC14_WORLD, FCC14, WORLD},
|
||||
{FCC15_FCCA, FCC15, FCCA},
|
||||
{FCC16_FCCA, FCC16, FCCA},
|
||||
|
||||
@@ -1625,23 +1627,24 @@ const struct regdomain regdomains_5g[] = {
|
||||
* both AP and STA (eg ETSI1_VLP_6G).
|
||||
*/
|
||||
enum reg_subdomains_6g {
|
||||
FCC1_AP_LPI_6G,
|
||||
FCC1_AP_SP_6G,
|
||||
FCC1_CLIENT_SP_6G,
|
||||
FCC1_CLIENT_LPI_REGULAR_6G,
|
||||
ETSI1_LPI_6G,
|
||||
ETSI1_VLP_6G,
|
||||
ETSI2_LPI_6G,
|
||||
ETSI2_VLP_6G,
|
||||
APL1_LPI_6G,
|
||||
APL1_VLP_6G,
|
||||
FCC1_CLIENT_LPI_REGULAR_6G = 0x01,
|
||||
FCC1_CLIENT_SP_6G = 0x02,
|
||||
FCC1_AP_LPI_6G = 0x03,
|
||||
FCC1_CLIENT_LPI_SUBORDINATE = FCC1_AP_LPI_6G,
|
||||
FCC1_AP_SP_6G = 0x04,
|
||||
ETSI1_LPI_6G = 0x10,
|
||||
ETSI1_VLP_6G = 0x11,
|
||||
ETSI2_LPI_6G = 0x12,
|
||||
ETSI2_VLP_6G = 0x13,
|
||||
APL1_LPI_6G = 0x20,
|
||||
APL1_VLP_6G = 0x21,
|
||||
};
|
||||
|
||||
/**
|
||||
* Table of 6G super domain to sub domain.
|
||||
*/
|
||||
static const struct sixghz_super_to_subdomains g_6g_reg_dmn_9_tuples[] = {
|
||||
{FCC1_6G, FCC1_AP_SP_6G, FCC1_AP_LPI_6G, 0,
|
||||
{FCC1_6G, 0, FCC1_AP_LPI_6G, 0,
|
||||
{FCC1_CLIENT_SP_6G, FCC1_CLIENT_SP_6G},
|
||||
{FCC1_CLIENT_LPI_REGULAR_6G, FCC1_AP_LPI_6G},
|
||||
{0, 0} },
|
||||
@@ -1651,6 +1654,9 @@ static const struct sixghz_super_to_subdomains g_6g_reg_dmn_9_tuples[] = {
|
||||
{0, 0}, {ETSI2_LPI_6G, ETSI2_LPI_6G}, {ETSI2_VLP_6G, ETSI2_VLP_6G} },
|
||||
{APL1_6G, 0, APL1_LPI_6G, APL1_VLP_6G,
|
||||
{0, 0}, {APL1_LPI_6G, APL1_LPI_6G}, {APL1_VLP_6G, APL1_VLP_6G} },
|
||||
{FCC1_6G_CL, 0, FCC1_AP_LPI_6G, 0,
|
||||
{0, 0}, {FCC1_CLIENT_LPI_REGULAR_6G, FCC1_CLIENT_LPI_SUBORDINATE},
|
||||
{0, 0} },
|
||||
};
|
||||
|
||||
/**
|
||||
|
Criar uma nova questão referindo esta
Bloquear um utilizador