qcacmn: Resolve dfs region namespace conflict
Resolve the namespace conflict between the host and firmware wmi common header files by changing the dfs region enum name in the host regdb component. Change-Id: I8f0bbd60063fecd9d78338984e91117a23bc423b CRs-Fixed: 2300356
This commit is contained in:
Shashikala Prabhu
committed by
nshrivas
nshrivas
orang tua
339b01d8ae
melakukan
7e4a175385
@@ -972,17 +972,18 @@ const struct regulatory_rule reg_rules_2g[] = {
|
||||
|
||||
const struct regdomain regdomains_2g[] = {
|
||||
|
||||
[FCCA] = {CTL_FCC, DFS_UNINIT_REG, 0, 6, 1, {CHAN_1_11_1} },
|
||||
[FCCB] = {CTL_FCC, DFS_UNINIT_REG, 0, 6, 1, {CHAN_1_11_3} },
|
||||
[WORLD] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_1} },
|
||||
[MKKA] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 2, {CHAN_1_13_4, CHAN_14_1} },
|
||||
[MKKC] = {CTL_MKK, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_4} },
|
||||
[ETSIC] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_2} },
|
||||
[ETSID] = {CTL_ETSI, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_13_3} },
|
||||
[WORLD_2G_1] = {CTL_NONE, DFS_UNINIT_REG, 0, 0, 1, {CHAN_1_11_2} },
|
||||
[WORLD_2G_2] = {CTL_NONE, DFS_UNINIT_REG, 0, 0, 2,
|
||||
[FCCA] = {CTL_FCC, DFS_UNINIT_REGION, 0, 6, 1, {CHAN_1_11_1} },
|
||||
[FCCB] = {CTL_FCC, DFS_UNINIT_REGION, 0, 6, 1, {CHAN_1_11_3} },
|
||||
[WORLD] = {CTL_ETSI, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_13_1} },
|
||||
[MKKA] = {CTL_MKK, DFS_UNINIT_REGION, 0, 0, 2, {CHAN_1_13_4,
|
||||
CHAN_14_1} },
|
||||
[MKKC] = {CTL_MKK, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_13_4} },
|
||||
[ETSIC] = {CTL_ETSI, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_13_2} },
|
||||
[ETSID] = {CTL_ETSI, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_13_3} },
|
||||
[WORLD_2G_1] = {CTL_NONE, DFS_UNINIT_REGION, 0, 0, 1, {CHAN_1_11_2} },
|
||||
[WORLD_2G_2] = {CTL_NONE, DFS_UNINIT_REGION, 0, 0, 2,
|
||||
{CHAN_1_11_2, CHAN_12_13_1} },
|
||||
[WORLD_2G_3] = {CTL_NONE, DFS_UNINIT_REG, 0, 0, 3,
|
||||
[WORLD_2G_3] = {CTL_NONE, DFS_UNINIT_REGION, 0, 0, 3,
|
||||
{CHAN_1_11_2, CHAN_12_13_1, CHAN_14_2} },
|
||||
};
|
||||
|
||||
@@ -1141,189 +1142,189 @@ const struct regulatory_rule reg_rules_5g[] = {
|
||||
|
||||
const struct regdomain regdomains_5g[] = {
|
||||
|
||||
[FCC1] = {CTL_FCC, DFS_FCC_REG, 2, 6, 3, {CHAN_5170_5250_1,
|
||||
[FCC1] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 3, {CHAN_5170_5250_1,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[FCC2] = {CTL_FCC, DFS_FCC_REG, 2, 6, 3, {CHAN_5170_5250_2,
|
||||
[FCC2] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 3, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[FCC3] = {CTL_FCC, DFS_FCC_REG, 2, 6, 4, {CHAN_5170_5250_5,
|
||||
[FCC3] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_5,
|
||||
CHAN_5250_5330_7,
|
||||
CHAN_5490_5730_1,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[FCC4] = {CTL_FCC, DFS_FCC_REG, 2, 6, 1, {CHAN_4940_4990_1} },
|
||||
[FCC4] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 1, {CHAN_4940_4990_1} },
|
||||
|
||||
[FCC5] = {CTL_FCC, DFS_UNINIT_REG, 2, 6, 2, {CHAN_5170_5250_4,
|
||||
[FCC5] = {CTL_FCC, DFS_UNINIT_REGION, 2, 6, 2, {CHAN_5170_5250_4,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[FCC6] = {CTL_FCC, DFS_FCC_REG, 2, 6, 5, {CHAN_5170_5250_5,
|
||||
[FCC6] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 5, {CHAN_5170_5250_5,
|
||||
CHAN_5250_5330_7,
|
||||
CHAN_5490_5590_1,
|
||||
CHAN_5650_5730_1,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[FCC8] = {CTL_FCC, DFS_FCC_REG, 2, 6, 4, {CHAN_5170_5250_4,
|
||||
[FCC8] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_4,
|
||||
CHAN_5250_5330_7,
|
||||
CHAN_5490_5730_1,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[FCC10] = {CTL_FCC, DFS_FCC_REG, 2, 0, 5, {CHAN_5170_5250_4,
|
||||
[FCC10] = {CTL_FCC, DFS_FCC_REGION, 2, 0, 5, {CHAN_5170_5250_4,
|
||||
CHAN_5250_5330_7,
|
||||
CHAN_5490_5730_1,
|
||||
CHAN_5735_5835_2,
|
||||
CHAN_5850_5925_1} },
|
||||
|
||||
[FCC11] = {CTL_FCC, DFS_FCC_REG, 2, 6, 4, {CHAN_5170_5250_5,
|
||||
[FCC11] = {CTL_FCC, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_5,
|
||||
CHAN_5250_5330_7,
|
||||
CHAN_5490_5650_2,
|
||||
CHAN_5735_5835_6} },
|
||||
|
||||
[FCC13] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 4, {CHAN_5170_5330_2,
|
||||
[FCC13] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 4, {CHAN_5170_5330_2,
|
||||
CHAN_5250_5330_10,
|
||||
CHAN_5490_5730_4,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[FCC14] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 4, {CHAN_5170_5250_4,
|
||||
[FCC14] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 4, {CHAN_5170_5250_4,
|
||||
CHAN_5250_5330_10,
|
||||
CHAN_5490_5730_4,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[ETSI1] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
[ETSI1] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5490_5710_1} },
|
||||
|
||||
[ETSI3] = {CTL_ETSI, DFS_ETSI_REG, 5, 0, 2, {CHAN_5170_5250_2,
|
||||
[ETSI3] = {CTL_ETSI, DFS_ETSI_REGION, 5, 0, 2, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1} },
|
||||
|
||||
[ETSI4] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 2, {CHAN_5170_5250_6,
|
||||
[ETSI4] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 2, {CHAN_5170_5250_6,
|
||||
CHAN_5250_5330_3} },
|
||||
|
||||
[ETSI8] = {CTL_ETSI, DFS_UNINIT_REG, 20, 0, 4, {CHAN_5170_5250_2,
|
||||
[ETSI8] = {CTL_ETSI, DFS_UNINIT_REGION, 20, 0, 4, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_5,
|
||||
CHAN_5490_5730_3,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[ETSI9] = {CTL_ETSI, DFS_ETSI_REG, 20, 0, 4, {CHAN_5170_5250_2,
|
||||
[ETSI9] = {CTL_ETSI, DFS_ETSI_REGION, 20, 0, 4, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5490_5710_5,
|
||||
CHAN_5735_5835_6} },
|
||||
|
||||
[ETSI10] = {CTL_ETSI, DFS_ETSI_REG, 10, 0, 4, {CHAN_5170_5250_3,
|
||||
[ETSI10] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_3,
|
||||
CHAN_5250_5330_2,
|
||||
CHAN_5490_5710_3,
|
||||
CHAN_5850_5925_2} },
|
||||
|
||||
[ETSI11] = {CTL_ETSI, DFS_ETSI_REG, 10, 0, 4, {CHAN_5170_5250_3,
|
||||
[ETSI11] = {CTL_ETSI, DFS_ETSI_REGION, 10, 0, 4, {CHAN_5170_5250_3,
|
||||
CHAN_5250_5330_2,
|
||||
CHAN_5490_5710_3,
|
||||
CHAN_5735_5875_1} },
|
||||
|
||||
[ETSI12] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_3,
|
||||
[ETSI12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_3,
|
||||
CHAN_5250_5330_2,
|
||||
CHAN_5490_5730_6,
|
||||
CHAN_5735_5835_8} },
|
||||
|
||||
[ETSI13] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_2,
|
||||
[ETSI13] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5490_5730_5,
|
||||
CHAN_5735_5875_4} },
|
||||
|
||||
[ETSI14] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_2,
|
||||
[ETSI14] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5490_5730_7,
|
||||
CHAN_5735_5875_5} },
|
||||
|
||||
[APL1] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5735_5835_2} },
|
||||
[APL1] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 1, {CHAN_5735_5835_2} },
|
||||
|
||||
[APL2] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5735_5815_1} },
|
||||
[APL2] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 1, {CHAN_5735_5815_1} },
|
||||
|
||||
[APL4] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 2, {CHAN_5170_5250_2,
|
||||
[APL4] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 2, {CHAN_5170_5250_2,
|
||||
CHAN_5735_5835_1} },
|
||||
|
||||
[APL6] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 3, {CHAN_5170_5250_3,
|
||||
[APL6] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_3,
|
||||
CHAN_5250_5330_2,
|
||||
CHAN_5735_5835_3} },
|
||||
|
||||
[APL8] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 2, {CHAN_5250_5330_4,
|
||||
[APL8] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 2, {CHAN_5250_5330_4,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[APL9] = {CTL_ETSI, DFS_KR_REG, 2, 6, 4, {CHAN_5170_5250_3,
|
||||
[APL9] = {CTL_ETSI, DFS_KR_REGION, 2, 6, 4, {CHAN_5170_5250_3,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5490_5710_1,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[APL10] = {CTL_ETSI, DFS_FCC_REG, 2, 6, 4, {CHAN_5170_5250_2,
|
||||
[APL10] = {CTL_ETSI, DFS_FCC_REGION, 2, 6, 4, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_4,
|
||||
CHAN_5490_5710_1,
|
||||
CHAN_5735_5815_1} },
|
||||
|
||||
[APL11] = { CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_9,
|
||||
[APL11] = { CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_9,
|
||||
CHAN_5250_5330_13,
|
||||
CHAN_5490_5710_4,
|
||||
CHAN_5735_5875_2} },
|
||||
|
||||
[APL12] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
[APL12] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
CHAN_5490_5570_1,
|
||||
CHAN_5735_5775_1} },
|
||||
|
||||
[APL13] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
[APL13] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5490_5670_2} },
|
||||
|
||||
[APL14] = {CTL_FCC, DFS_CN_REG, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
[APL14] = {CTL_FCC, DFS_CN_REGION, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5735_5835_4} },
|
||||
|
||||
[APL15] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
[APL15] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_5,
|
||||
CHAN_5735_5835_4} },
|
||||
|
||||
[APL16] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 5, {CHAN_5170_5250_1,
|
||||
[APL16] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 5, {CHAN_5170_5250_1,
|
||||
CHAN_5250_5330_6,
|
||||
CHAN_5490_5590_2,
|
||||
CHAN_5650_5730_2,
|
||||
CHAN_5735_5835_2} },
|
||||
|
||||
[APL17] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 5, {CHAN_5170_5250_2,
|
||||
[APL17] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 5, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_8,
|
||||
CHAN_5490_5590_3,
|
||||
CHAN_5650_5730_3,
|
||||
CHAN_5735_5835_7} },
|
||||
|
||||
[APL19] = {CTL_FCC, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
[APL19] = {CTL_FCC, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_5,
|
||||
CHAN_5735_5875_3} },
|
||||
|
||||
[APL20] = {CTL_ETSI, DFS_ETSI_REG, 2, 0, 4, {CHAN_5170_5250_8,
|
||||
[APL20] = {CTL_ETSI, DFS_ETSI_REGION, 2, 0, 4, {CHAN_5170_5250_8,
|
||||
CHAN_5250_5330_12,
|
||||
CHAN_5490_5730_5,
|
||||
CHAN_5735_5835_4} },
|
||||
|
||||
[APL23] = {CTL_ETSI, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5250_7,
|
||||
[APL23] = {CTL_ETSI, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5250_7,
|
||||
CHAN_5250_5330_11,
|
||||
CHAN_5735_5835_3} },
|
||||
|
||||
[MKK3] = {CTL_MKK, DFS_UNINIT_REG, 2, 0, 1, {CHAN_5170_5250_3} },
|
||||
[MKK3] = {CTL_MKK, DFS_UNINIT_REGION, 2, 0, 1, {CHAN_5170_5250_3} },
|
||||
|
||||
[MKK5] = {CTL_MKK, DFS_MKK_REG, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
[MKK5] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 3, {CHAN_5170_5250_2,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5490_5710_7} },
|
||||
|
||||
[MKK11] = {CTL_MKK, DFS_MKK_REG, 2, 0, 5, {CHAN_4910_4990_1,
|
||||
[MKK11] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 5, {CHAN_4910_4990_1,
|
||||
CHAN_5170_5250_2,
|
||||
CHAN_5030_5090_1,
|
||||
CHAN_5250_5330_1,
|
||||
CHAN_5490_5710_7} },
|
||||
|
||||
[MKK16] = {CTL_MKK, DFS_MKK_REG, 2, 0, 1, {CHAN_5490_5710_6} },
|
||||
[MKK16] = {CTL_MKK, DFS_MKK_REGION, 2, 0, 1, {CHAN_5490_5710_6} },
|
||||
|
||||
[WORLD_5G_1] = {CTL_NONE, DFS_UNINIT_REG, 2, 0, 2, {CHAN_5170_5330_1,
|
||||
[WORLD_5G_1] = {CTL_NONE, DFS_UNINIT_REGION, 2, 0, 2, {CHAN_5170_5330_1,
|
||||
CHAN_5735_5835_5} },
|
||||
|
||||
[WORLD_5G_2] = {CTL_NONE, DFS_UNINIT_REG, 2, 0, 3, {CHAN_5170_5330_1,
|
||||
[WORLD_5G_2] = {CTL_NONE, DFS_UNINIT_REGION, 2, 0, 3, {CHAN_5170_5330_1,
|
||||
CHAN_5490_5730_2,
|
||||
CHAN_5735_5835_5} },
|
||||
};
|
||||
|
||||
@@ -49,22 +49,22 @@
|
||||
|
||||
/**
|
||||
* enum dfs_reg - DFS region
|
||||
* @DFS_UNINIT_REG: un-initialized region
|
||||
* @DFS_FCC_REG: FCC region
|
||||
* @DFS_ETSI_REG: ETSI region
|
||||
* @DFS_MKK_REG: MKK region
|
||||
* @DFS_CN_REG: China region
|
||||
* @DFS_KR_REG: Korea region
|
||||
* @DFS_UNDEF_REG: Undefined region
|
||||
* @DFS_UNINIT_REGION: un-initialized region
|
||||
* @DFS_FCC_REGION: FCC region
|
||||
* @DFS_ETSI_REGION: ETSI region
|
||||
* @DFS_MKK_REGION: MKK region
|
||||
* @DFS_CN_REGION: China region
|
||||
* @DFS_KR_REGION: Korea region
|
||||
* @DFS_UNDEF_REGION: Undefined region
|
||||
*/
|
||||
enum dfs_reg {
|
||||
DFS_UNINIT_REG = 0,
|
||||
DFS_FCC_REG = 1,
|
||||
DFS_ETSI_REG = 2,
|
||||
DFS_MKK_REG = 3,
|
||||
DFS_CN_REG = 4,
|
||||
DFS_KR_REG = 5,
|
||||
DFS_UNDEF_REG = 0xFFFF,
|
||||
DFS_UNINIT_REGION = 0,
|
||||
DFS_FCC_REGION = 1,
|
||||
DFS_ETSI_REGION = 2,
|
||||
DFS_MKK_REGION = 3,
|
||||
DFS_CN_REGION = 4,
|
||||
DFS_KR_REGION = 5,
|
||||
DFS_UNDEF_REGION = 0xFFFF,
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -1581,23 +1581,23 @@ static void reg_init_channel_map(enum dfs_reg dfs_region)
|
||||
static void reg_init_channel_map(enum dfs_reg dfs_region)
|
||||
{
|
||||
switch (dfs_region) {
|
||||
case DFS_UNINIT_REG:
|
||||
case DFS_UNDEF_REG:
|
||||
case DFS_UNINIT_REGION:
|
||||
case DFS_UNDEF_REGION:
|
||||
channel_map = channel_map_global;
|
||||
break;
|
||||
case DFS_FCC_REG:
|
||||
case DFS_FCC_REGION:
|
||||
channel_map = channel_map_us;
|
||||
break;
|
||||
case DFS_ETSI_REG:
|
||||
case DFS_ETSI_REGION:
|
||||
channel_map = channel_map_eu;
|
||||
break;
|
||||
case DFS_MKK_REG:
|
||||
case DFS_MKK_REGION:
|
||||
channel_map = channel_map_jp;
|
||||
break;
|
||||
case DFS_CN_REG:
|
||||
case DFS_CN_REGION:
|
||||
channel_map = channel_map_china;
|
||||
break;
|
||||
case DFS_KR_REG:
|
||||
case DFS_KR_REGION:
|
||||
channel_map = channel_map_eu;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user