A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Regdomain kernel-doc and other changes

Browse source 
Add kernel documentation for regdomain data structures. Also
rename some of the data structures to better names.

Change-Id: Iae26079ae8a7f06e2670594694ae36c2c2a0a524
CRs-Fixed: 961806
This commit is contained in:
Amar Singhal 2016-01-27 11:31:59 -08:00 • committed by Gerrit - the friendly Code Review server
commit a7bb01b460
11 changed files with 303 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

449
core/cds/inc/cds_regdomain.h
View file

@ -77,177 +77,6 @@
#define COUNTRY_ERD_FLAG 0x8000
#define WORLDWIDE_ROAMING_FLAG 0x4000
enum reg_domain {
NO_ENUMRD = 0x00,
NULL1_WORLD = 0x03,
NULL1_ETSIB = 0x07,
NULL1_ETSIC = 0x08,
FCC1_FCCA = 0x10,
FCC1_WORLD = 0x11,
FCC2_FCCA = 0x20,
FCC2_WORLD = 0x21,
FCC2_ETSIC = 0x22,
FCC3_FCCA = 0x3A,
FCC3_WORLD = 0x3B,
FCC3_ETSIC = 0x3F,
FCC4_FCCA = 0x12,
FCC5_FCCA = 0x13,
FCC6_FCCA = 0x14,
FCC7_FCCA = 0x15,
FCC8_FCCA = 0x16,
FCC6_WORLD = 0x23,
FCC9_FCCA = 0x17,
FCC10_FCCA = 0x18,
FCC11_WORLD = 0x19,
ETSI1_WORLD = 0x37,
ETSI3_ETSIA = 0x32,
ETSI2_WORLD = 0x35,
ETSI3_WORLD = 0x36,
ETSI4_WORLD = 0x30,
ETSI4_ETSIC = 0x38,
ETSI5_WORLD = 0x39,
ETSI6_WORLD = 0x34,
ETSI_RESERVED = 0x33,
FRANCE_RES = 0x31,
ETSI7_WORLD = 0x3C,
ETSI8_WORLD = 0x3D,
ETSI9_WORLD = 0x3E,
ETSI10_WORLD = 0x24,
ETSI11_WORLD = 0x26,
APL4_WORLD = 0x42,
APL3_FCCA = 0x50,
APL_RESERVED = 0x44,
APL2_WORLD = 0x45,
APL2_FCCA = 0x4D,
APL2_APLC = 0x46,
APL3_WORLD = 0x47,
APL2_APLD = 0x49,
APL1_WORLD = 0x52,
APL1_FCCA = 0x53,
APL1_APLA = 0x54,
APL1_ETSIC = 0x55,
APL2_ETSIC = 0x56,
APL5_WORLD = 0x58,
APL6_WORLD = 0x5B,
APL7_FCCA = 0x5C,
APL8_WORLD = 0x5D,
APL9_WORLD = 0x5E,
APL10_WORLD = 0x5F,
APL11_FCCA = 0x4F,
APL12_WORLD = 0x51,
APL13_WORLD = 0x5A,
WOR0_WORLD = 0x60,
WOR1_WORLD = 0x61,
WOR2_WORLD = 0x62,
WOR3_WORLD = 0x63,
WOR4_FCCA = 0x64,
WOR5_ETSIC = 0x65,
WOR01_WORLD = 0x66,
WOR02_WORLD = 0x67,
EU1_WORLD = 0x68,
WOR9_WORLD = 0x69,
WORA_WORLD = 0x6A,
WORB_WORLD = 0x6B,
WORC_WORLD = 0x6C,
MKK3_MKKB = 0x80,
MKK3_MKKA2 = 0x81,
MKK3_MKKC = 0x82,
MKK4_MKKB = 0x83,
MKK4_MKKA2 = 0x84,
MKK4_MKKC = 0x85,
MKK5_MKKA = 0x99,
MKK5_FCCA = 0x9A,
MKK5_MKKB = 0x86,
MKK5_MKKA2 = 0x87,
MKK5_MKKC = 0x88,
MKK3_MKKA = 0xF0,
MKK3_MKKA1 = 0xF1,
MKK3_FCCA = 0xF2,
MKK4_MKKA = 0xF3,
MKK4_MKKA1 = 0xF4,
MKK4_FCCA = 0xF5,
MKK9_MKKA = 0xF6,
MKK9_FCCA = 0xFC,
MKK9_MKKA1 = 0xFD,
MKK9_MKKC = 0xFE,
MKK9_MKKA2 = 0xFF,
MKK10_MKKA = 0xF7,
MKK10_FCCA = 0xD0,
MKK10_MKKA1 = 0xD1,
MKK10_MKKC = 0xD2,
MKK10_MKKA2 = 0xD3,
MKK11_MKKA = 0xD4,
MKK11_FCCA = 0xD5,
MKK11_MKKA1 = 0xD6,
MKK11_MKKC = 0xD7,
MKK11_MKKA2 = 0xD8,
FCC1 = 0x0110,
FCC2 = 0x0120,
FCC3 = 0x0160,
FCC4 = 0x0165,
FCC5 = 0x0510,
FCC6 = 0x0610,
FCC7 = 0x0710,
FCC8 = 0x0810,
FCC9 = 0x0910,
FCC10 = 0x0B10,
FCC11 = 0x0B20,
ETSI1 = 0x0130,
ETSI2 = 0x0230,
ETSI3 = 0x0330,
ETSI4 = 0x0430,
ETSI5 = 0x0530,
ETSI6 = 0x0630,
ETSI8 = 0x0830,
ETSI9 = 0x0930,
ETSI10 = 0x0D30,
ETSI11 = 0x0E30,
APL1 = 0x0150,
APL2 = 0x0250,
APL3 = 0x0350,
APL4 = 0x0450,
APL5 = 0x0550,
APL6 = 0x0650,
APL7 = 0x0750,
APL8 = 0x0850,
APL9 = 0x0950,
APL10 = 0x1050,
APL11 = 0x1150,
APL12 = 0x1160,
APL13 = 0x1170,
NULL1 = 0x0198,
MKK3 = 0x0340,
MKK4 = 0x0440,
MKK5 = 0x0540,
MKK9 = 0x0940,
MKK10 = 0x1040,
MKK11 = 0x1140,
WORLD = 0x0199,
FCCA = 0x0A10,
MKKA = 0x0A40,
MKKC = 0x0A50,
ETSIC = 0x0C30,
DEBUG_REG_DMN = 0x01ff,
};
enum ctl_val {
FCC = 0x10,
MKK = 0x40,
ETSI = 0x30,
NO_CTL = 0xff
};
enum country_code {
CTRY_AFGHANISTAN = 4,
CTRY_ALBANIA = 8,
@ -461,25 +290,194 @@ enum country_code {
CTRY_JAPAN56 = 4056,
};
enum dfs_domain {
DFS_UNINIT_DOMAIN = 0,
DFS_FCC_DOMAIN = 1,
DFS_ETSI_DOMAIN = 2,
DFS_MKK4_DOMAIN = 3
enum reg_domain {
NO_ENUMRD = 0x00,
NULL1_WORLD = 0x03,
NULL1_ETSIB = 0x07,
NULL1_ETSIC = 0x08,
FCC1_FCCA = 0x10,
FCC1_WORLD = 0x11,
FCC2_FCCA = 0x20,
FCC2_WORLD = 0x21,
FCC2_ETSIC = 0x22,
FCC3_FCCA = 0x3A,
FCC3_WORLD = 0x3B,
FCC3_ETSIC = 0x3F,
FCC4_FCCA = 0x12,
FCC5_FCCA = 0x13,
FCC6_FCCA = 0x14,
FCC7_FCCA = 0x15,
FCC8_FCCA = 0x16,
FCC6_WORLD = 0x23,
FCC9_FCCA = 0x17,
FCC10_FCCA = 0x18,
FCC11_WORLD = 0x19,
ETSI1_WORLD = 0x37,
ETSI3_ETSIA = 0x32,
ETSI2_WORLD = 0x35,
ETSI3_WORLD = 0x36,
ETSI4_WORLD = 0x30,
ETSI4_ETSIC = 0x38,
ETSI5_WORLD = 0x39,
ETSI6_WORLD = 0x34,
ETSI_RESERVED = 0x33,
FRANCE_RES = 0x31,
ETSI7_WORLD = 0x3C,
ETSI8_WORLD = 0x3D,
ETSI9_WORLD = 0x3E,
ETSI10_WORLD = 0x24,
ETSI11_WORLD = 0x26,
APL4_WORLD = 0x42,
APL3_FCCA = 0x50,
APL_RESERVED = 0x44,
APL2_WORLD = 0x45,
APL2_FCCA = 0x4D,
APL2_APLC = 0x46,
APL3_WORLD = 0x47,
APL2_APLD = 0x49,
APL1_WORLD = 0x52,
APL1_FCCA = 0x53,
APL1_APLA = 0x54,
APL1_ETSIC = 0x55,
APL2_ETSIC = 0x56,
APL5_WORLD = 0x58,
APL6_WORLD = 0x5B,
APL7_FCCA = 0x5C,
APL8_WORLD = 0x5D,
APL9_WORLD = 0x5E,
APL10_WORLD = 0x5F,
APL11_FCCA = 0x4F,
APL12_WORLD = 0x51,
APL13_WORLD = 0x5A,
WOR0_WORLD = 0x60,
WOR1_WORLD = 0x61,
WOR2_WORLD = 0x62,
WOR3_WORLD = 0x63,
WOR4_FCCA = 0x64,
WOR5_ETSIC = 0x65,
WOR01_WORLD = 0x66,
WOR02_WORLD = 0x67,
EU1_WORLD = 0x68,
WOR9_WORLD = 0x69,
WORA_WORLD = 0x6A,
WORB_WORLD = 0x6B,
WORC_WORLD = 0x6C,
MKK3_MKKB = 0x80,
MKK3_MKKA2 = 0x81,
MKK3_MKKC = 0x82,
MKK4_MKKB = 0x83,
MKK4_MKKA2 = 0x84,
MKK4_MKKC = 0x85,
MKK5_MKKA = 0x99,
MKK5_FCCA = 0x9A,
MKK5_MKKB = 0x86,
MKK5_MKKA2 = 0x87,
MKK5_MKKC = 0x88,
MKK3_MKKA = 0xF0,
MKK3_MKKA1 = 0xF1,
MKK3_FCCA = 0xF2,
MKK4_MKKA = 0xF3,
MKK4_MKKA1 = 0xF4,
MKK4_FCCA = 0xF5,
MKK9_MKKA = 0xF6,
MKK9_FCCA = 0xFC,
MKK9_MKKA1 = 0xFD,
MKK9_MKKC = 0xFE,
MKK9_MKKA2 = 0xFF,
MKK10_MKKA = 0xF7,
MKK10_FCCA = 0xD0,
MKK10_MKKA1 = 0xD1,
MKK10_MKKC = 0xD2,
MKK10_MKKA2 = 0xD3,
MKK11_MKKA = 0xD4,
MKK11_FCCA = 0xD5,
MKK11_MKKA1 = 0xD6,
MKK11_MKKC = 0xD7,
MKK11_MKKA2 = 0xD8,
FCC1 = 0x0110,
FCC2 = 0x0120,
FCC3 = 0x0160,
FCC4 = 0x0165,
FCC5 = 0x0510,
FCC6 = 0x0610,
FCC7 = 0x0710,
FCC8 = 0x0810,
FCC9 = 0x0910,
FCC10 = 0x0B10,
FCC11 = 0x0B20,
ETSI1 = 0x0130,
ETSI2 = 0x0230,
ETSI3 = 0x0330,
ETSI4 = 0x0430,
ETSI5 = 0x0530,
ETSI6 = 0x0630,
ETSI8 = 0x0830,
ETSI9 = 0x0930,
ETSI10 = 0x0D30,
ETSI11 = 0x0E30,
APL1 = 0x0150,
APL2 = 0x0250,
APL3 = 0x0350,
APL4 = 0x0450,
APL5 = 0x0550,
APL6 = 0x0650,
APL7 = 0x0750,
APL8 = 0x0850,
APL9 = 0x0950,
APL10 = 0x1050,
APL11 = 0x1150,
APL12 = 0x1160,
APL13 = 0x1170,
NULL1 = 0x0198,
MKK3 = 0x0340,
MKK4 = 0x0440,
MKK5 = 0x0540,
MKK9 = 0x0940,
MKK10 = 0x1040,
MKK11 = 0x1140,
WORLD = 0x0199,
FCCA = 0x0A10,
MKKA = 0x0A40,
MKKC = 0x0A50,
ETSIC = 0x0C30,
};
struct reg_dmn_pair {
uint16_t reg_dmn_enum;
uint16_t reg_dmn_5ghz;
uint16_t reg_dmn_2ghz;
uint16_t single_cc;
/**
* enum ctl_val - CTL value
* @FCC: FCC
* @MKK: MKK
* @ETSI: ETSI
* @NO_CTL: no CTL
*/
enum ctl_val {
FCC = 0x10,
MKK = 0x40,
ETSI = 0x30,
NO_CTL = 0xff
};
struct country_code_to_reg_dmn {
uint16_t country_code;
uint16_t reg_dmn_enum;
const char *iso_name;
const char *name;
/**
* enum dfs_region - DFS region
* @DFS_UNINIT_REGION: un-initialized region
* @DFS_FCC_REGION: FCC region
* @DFS_ETSI_REGION: ETSI region
* @DFS_MKK_REGION: MKK region
*/
enum dfs_region {
DFS_UNINIT_REGION = 0,
DFS_FCC_REGION = 1,
DFS_ETSI_REGION = 2,
DFS_MKK_REGION = 3
};
/**
@ -499,9 +497,52 @@ enum ch_width {
CH_WIDTH_MAX
};
/**
* enum offset_t: channel offset
* @BW20: 20 mhz channel
* @BW40_LOW_PRIMARY: lower channel in 40 mhz
* @BW40_HIGH_PRIMARY: higher channel in 40 mhz
* @BW80: 80 mhz channel
* @BWALL: unknown bandwidth
*/
enum offset_t {
BW20 = 0,
BW40_LOW_PRIMARY = 1,
BW40_HIGH_PRIMARY = 3,
BW80,
BWALL
};
/**
* struct reg_dmn_pair: regulatory domain pair
* @reg_dmn_pair: reg domain pair
* @reg_dmn_5ghz: 5G reg domain
* @reg_dmn_2ghz: 2G reg domain
* @single_cc: country with this reg domain
*/
struct reg_dmn_pair {
uint16_t reg_dmn_pair;
uint16_t reg_dmn_5ghz;
uint16_t reg_dmn_2ghz;
uint16_t single_cc;
};
/**
* struct country_code_to_reg_dmn: country code to reg domain mapping
* @country_code: country code
* @reg_dmn_pair: regulatory domain pair
* @alpha2: country alpha2
* @name: country name
*/
struct country_code_to_reg_dmn {
uint16_t country_code;
uint16_t reg_dmn_pair;
const char *alpha2;
const char *name;
};
/**
* struct ch_params_s
*
* @ch_width: channel width
* @sec_ch_offset: secondary channel offset
* @center_freq_seg0: center freq for segment 0
@ -514,19 +555,23 @@ struct ch_params_s {
uint8_t center_freq_seg1;
};
/**
* struct reg_dmn: regulatory domain structure
* @reg_dmn: regulatory domain
* @conformance_test_limit: CTL limit
*/
struct reg_dmn {
uint16_t reg_dmn;
uint8_t conformance_test_limit;
};
enum offset_t {
BW20 = 0,
BW40_LOW_PRIMARY = 1,
BW40_HIGH_PRIMARY = 3,
BW80,
BWALL
};
/**
* struct reg_dmn_op_class_map_t: operating class
* @op_class: operating class number
* @ch_spacing: channel spacing
* @offset: offset
* @channels: channel set
*/
struct reg_dmn_op_class_map_t {
uint8_t op_class;
uint8_t ch_spacing;
@ -534,11 +579,25 @@ struct reg_dmn_op_class_map_t {
uint8_t channels[MAX_CHANNELS_PER_OPERATING_CLASS];
};
/**
* struct reg_dmn_supp_op_classes: operating classes
* @num_classes: number of classes
* @classes: classes
*/
struct reg_dmn_supp_op_classes {
uint8_t num_classes;
uint8_t classes[CDS_MAX_SUPP_OPER_CLASSES];
};
/**
* struct reg_dmn_tables: reg domain table
* @reg_dmn_pairs: list of reg domain pairs
* @all_countries: list of countries
* @reg_dmns: list of reg domains
* @reg_dmn_pairs_cnt: count of reg domain pairs
* @all_countries_cnt: count of countries
* @reg_dmns_cnt: count of reg domains
*/
struct reg_dmn_tables {
const struct reg_dmn_pair *reg_dmn_pairs;
const struct country_code_to_reg_dmn *all_countries;

26
core/cds/src/cds_regdomain.c
View file

@ -482,7 +482,7 @@ static bool is_reg_dmn_valid(uint16_t reg_dmn)
return true;
} else {
for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++)
if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum
if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_pair
== reg_dmn)
return true;
}
@ -522,8 +522,8 @@ int32_t cds_get_country_from_alpha2(uint8_t *alpha2)
int32_t i;
for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) {
if (g_reg_dmn_tbl.all_countries[i].iso_name[0] == alpha2[0] &&
g_reg_dmn_tbl.all_countries[i].iso_name[1] == alpha2[1])
if (g_reg_dmn_tbl.all_countries[i].alpha2[0] == alpha2[0] &&
g_reg_dmn_tbl.all_countries[i].alpha2[1] == alpha2[1])
return g_reg_dmn_tbl.all_countries[i].country_code;
}
@ -549,7 +549,7 @@ static uint16_t reg_dmn_get_default_country(uint16_t reg_dmn)
}
for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) {
if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn) {
if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_pair == reg_dmn) {
if (g_reg_dmn_tbl.reg_dmn_pairs[i].single_cc != 0)
return g_reg_dmn_tbl.reg_dmn_pairs[i].single_cc;
else
@ -571,7 +571,7 @@ static const struct reg_dmn_pair *get_reg_dmn_pair(uint16_t reg_dmn)
int32_t i;
for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) {
if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn)
if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_pair == reg_dmn)
return &g_reg_dmn_tbl.reg_dmn_pairs[i];
}
@ -608,7 +608,7 @@ static const struct country_code_to_reg_dmn *get_country_from_rd(
int32_t i;
for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) {
if (g_reg_dmn_tbl.all_countries[i].reg_dmn_enum == reg_dmn)
if (g_reg_dmn_tbl.all_countries[i].reg_dmn_pair == reg_dmn)
return &g_reg_dmn_tbl.all_countries[i];
}
@ -661,7 +661,7 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg)
return -EINVAL;
}
reg_dmn = country->reg_dmn_enum;
reg_dmn = country->reg_dmn_pair;
}
reg->regpair = get_reg_dmn_pair(reg_dmn);
@ -677,8 +677,8 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg)
country = get_country_from_rd(reg_dmn);
if (country) {
reg->alpha2[0] = country->iso_name[0];
reg->alpha2[1] = country->iso_name[1];
reg->alpha2[0] = country->alpha2[0];
reg->alpha2[1] = country->alpha2[1];
} else {
reg->alpha2[0] = '0';
reg->alpha2[1] = '0';
@ -698,9 +698,9 @@ int32_t get_reg_dmn_for_country(uint8_t *alpha2)
uint8_t i;
for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) {
if ((g_reg_dmn_tbl.all_countries[i].iso_name[0] == alpha2[0]) &&
(g_reg_dmn_tbl.all_countries[i].iso_name[1] == alpha2[1]))
return g_reg_dmn_tbl.all_countries[i].reg_dmn_enum;
if ((g_reg_dmn_tbl.all_countries[i].alpha2[0] == alpha2[0]) &&
(g_reg_dmn_tbl.all_countries[i].alpha2[1] == alpha2[1]))
return g_reg_dmn_tbl.all_countries[i].reg_dmn_pair;
}
return -1;
@ -785,7 +785,7 @@ uint16_t cds_get_reg_dmn_5g(uint32_t reg_dmn)
uint16_t i;
for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) {
if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn)
if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_pair == reg_dmn)
return g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_5ghz;
}

10
core/hdd/src/wlan_hdd_regulatory.c
View file

@ -142,7 +142,7 @@ struct regulatory *reg)
struct reg_dmn_pair *regpair =
(struct reg_dmn_pair *)reg->regpair;
switch (regpair->reg_dmn_enum) {
switch (regpair->reg_dmn_pair) {
case 0x60:
case 0x61:
case 0x62:
@ -497,17 +497,17 @@ static void hdd_set_dfs_region(hdd_context_t *hdd_ctx,
/* remap the ctl code to dfs region code */
switch (hdd_ctx->reg.ctl_5g) {
case FCC:
cds_put_dfs_region(DFS_FCC_DOMAIN);
cds_put_dfs_region(DFS_FCC_REGION);
break;
case ETSI:
cds_put_dfs_region(DFS_ETSI_DOMAIN);
cds_put_dfs_region(DFS_ETSI_REGION);
break;
case MKK:
cds_put_dfs_region(DFS_MKK4_DOMAIN);
cds_put_dfs_region(DFS_MKK_REGION);
break;
default:
/* set default dfs_region to FCC */
cds_put_dfs_region(DFS_FCC_DOMAIN);
cds_put_dfs_region(DFS_FCC_REGION);
break;
}

2
core/sap/dfs/src/dfs.c
View file

@ -61,7 +61,7 @@
#include "dfs_ioctl.h"
#include "dfs.h"
int domainoverride = DFS_UNINIT_DOMAIN;
int domainoverride = DFS_UNINIT_REGION;
/*
** channel switch announcement (CSA)

8
core/sap/dfs/src/dfs_process_phyerr.c
View file

@ -625,8 +625,8 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen,
*
* BIN 5 chirping pulses are only for FCC or Japan MMK4 domain
*/
if (((dfs->dfsdomain == DFS_FCC_DOMAIN) ||
(dfs->dfsdomain == DFS_MKK4_DOMAIN)) &&
if (((dfs->dfsdomain == DFS_FCC_REGION) ||
(dfs->dfsdomain == DFS_MKK_REGION)) &&
(e.dur >= MAYBE_BIN5_DUR) && (e.dur < MAX_BIN5_DUR)) {
int add_dur;
int slope = 0, dc_found = 0;
@ -675,8 +675,8 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen,
* We have a pulse that is either bigger than
* MAX_BIN5_DUR or * less than MAYBE_BIN5_DUR
*/
if ((dfs->dfsdomain == DFS_FCC_DOMAIN) ||
(dfs->dfsdomain == DFS_MKK4_DOMAIN)) {
if ((dfs->dfsdomain == DFS_FCC_REGION) ||
(dfs->dfsdomain == DFS_MKK_REGION)) {
/*
* XXX Would this result in very large pulses
* wrapping around to become short pulses?

16
core/sap/dfs/src/dfs_process_radarevent.c
View file

@ -176,7 +176,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
This is normally 2 but can be higher for W53.
*/
if ((dfs->dfsdomain == DFS_MKK4_DOMAIN) &&
if ((dfs->dfsdomain == DFS_MKK_REGION) &&
(dfs->dfs_caps.ath_chip_is_bb_tlv) &&
(chan->ic_freq < FREQ_5500_MHZ)) {
@ -430,8 +430,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
* so process the next pulse in the queue.
*/
if ((dfs->disable_dfs_ch_switch == false) &&
(DFS_FCC_DOMAIN == dfs->dfsdomain ||
DFS_MKK4_DOMAIN == dfs->dfsdomain) &&
(DFS_FCC_REGION == dfs->dfsdomain ||
DFS_MKK_REGION == dfs->dfsdomain) &&
(re.re_dur >= 11 && re.re_dur <= 20) &&
(diff_ts > 500 || diff_ts <= 305) &&
(re.sidx == -4)) {
@ -452,8 +452,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
* following condition is reported in radar
* summary report.
*/
if ((DFS_FCC_DOMAIN == dfs->dfsdomain ||
DFS_MKK4_DOMAIN == dfs->dfsdomain) &&
if ((DFS_FCC_REGION == dfs->dfsdomain ||
DFS_MKK_REGION == dfs->dfsdomain) &&
((chan->ic_flags & IEEE80211_CHAN_VHT80) ==
IEEE80211_CHAN_VHT80) &&
(chan->ic_pri_freq_center_freq_mhz_separation ==
@ -486,7 +486,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
* and ETSI type 3 radar pulses when the following
* condition is reported in radar summary report.
*/
if ((DFS_ETSI_DOMAIN == dfs->dfsdomain) &&
if ((DFS_ETSI_REGION == dfs->dfsdomain) &&
((chan->ic_flags & IEEE80211_CHAN_VHT80) ==
IEEE80211_CHAN_VHT80) &&
(chan->ic_pri_freq_center_freq_mhz_separation ==
@ -520,8 +520,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
/* BIN5 pulses are FCC and Japan specific */
if ((dfs->dfsdomain == DFS_FCC_DOMAIN)
|| (dfs->dfsdomain == DFS_MKK4_DOMAIN)) {
if ((dfs->dfsdomain == DFS_FCC_REGION)
|| (dfs->dfsdomain == DFS_MKK_REGION)) {
for (p = 0;
(p < dfs->dfs_rinfo.rn_numbin5radars) && (!found);
p++) {

6
core/sap/src/sap_fsm.c
View file

@ -1296,7 +1296,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
channelID = sapContext->SapAllChnlList.channelList[i].channel;
/*
* IN JAPAN REGULATORY DOMAIN CHECK IF THE FOLLOWING TWO
* IN MKK DFS REGION CHECK IF THE FOLLOWING TWO
* TWO RULES APPLY AND FILTER THE AVAILABLE CHANNELS
* ACCORDINGLY.
*
@ -1312,7 +1312,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
* channels only based up on the SAP Channel location
* indicated by "sap_operating_channel_location" param.
*/
if (DFS_MKK4_DOMAIN == dfs_region) {
if (DFS_MKK_REGION == dfs_region) {
/*
* Check for JAPAN W53 Channel operation capability
*/
@ -4698,7 +4698,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext)
cds_get_dfs_region(&dfs_region);
if ((dfs_region == DFS_ETSI_DOMAIN)
if ((dfs_region == DFS_ETSI_REGION)
&& ((IS_ETSI_WEATHER_CH(sapContext->channel)) ||
(sap_is_channel_bonding_etsi_weather_channel(sapContext)))) {
cacTimeOut = ETSI_WEATHER_CH_CAC_TIMEOUT;

4
core/sap/src/sap_module.c
View file

@ -2563,7 +2563,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53)
* Set the JAPAN W53 restriction only if the current
* regulatory domain is JAPAN.
*/
if (DFS_MKK4_DOMAIN == dfs_region) {
if (DFS_MKK_REGION == dfs_region) {
pMac->sap.SapDfsInfo.is_dfs_w53_disabled = disable_Dfs_W53;
QDF_TRACE(QDF_MODULE_ID_SAP,
QDF_TRACE_LEVEL_INFO_LOW,
@ -2648,7 +2648,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal,
* restriction is currently enforeced only for
* JAPAN regulatory domain.
*/
if (DFS_MKK4_DOMAIN == dfs_region) {
if (DFS_MKK_REGION == dfs_region) {
pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location =
dfs_Preferred_Channels_location;
QDF_TRACE(QDF_MODULE_ID_SAP,

2
core/wma/inc/wma_dfs_interface.h
View file

@ -260,7 +260,7 @@ typedef struct ieee80211com {
int (*ic_dfs_control)(struct ieee80211com *ic,
u_int id, void *indata, uint32_t insize,
void *outdata, uint32_t *outsize);
enum dfs_domain current_dfs_regdomain;
enum dfs_region current_dfs_regdomain;
uint8_t vdev_id;
uint8_t last_radar_found_chan;
int32_t dfs_pri_multiplier;

2
core/wma/src/wma_dev_if.c
View file

@ -1805,7 +1805,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma,
* early on, to protect the DFS module from
* processing phyerrors without being intialized.
*/
if (DFS_UNINIT_DOMAIN ==
if (DFS_UNINIT_REGION ==
wma->dfs_ic->current_dfs_regdomain) {
WMA_LOGE("%s[%d]:DFS Configured with Invalid regdomain"
" Failed to send VDEV START command",

22
core/wma/src/wma_features.c
View file

@ -6008,25 +6008,25 @@ void wma_dfs_configure(struct ieee80211com *ic)
* which radar pulses to use.
*/
switch (dfsdomain) {
case DFS_FCC_DOMAIN:
case DFS_FCC_REGION:
WMA_LOGI("%s: DFS-FCC domain", __func__);
rinfo.dfsdomain = DFS_FCC_DOMAIN;
rinfo.dfsdomain = DFS_FCC_REGION;
rinfo.dfs_radars = dfs_fcc_radars;
rinfo.numradars = QDF_ARRAY_SIZE(dfs_fcc_radars);
rinfo.b5pulses = dfs_fcc_bin5pulses;
rinfo.numb5radars = QDF_ARRAY_SIZE(dfs_fcc_bin5pulses);
break;
case DFS_ETSI_DOMAIN:
case DFS_ETSI_REGION:
WMA_LOGI("%s: DFS-ETSI domain", __func__);
rinfo.dfsdomain = DFS_ETSI_DOMAIN;
rinfo.dfsdomain = DFS_ETSI_REGION;
rinfo.dfs_radars = dfs_etsi_radars;
rinfo.numradars = QDF_ARRAY_SIZE(dfs_etsi_radars);
rinfo.b5pulses = NULL;
rinfo.numb5radars = 0;
break;
case DFS_MKK4_DOMAIN:
WMA_LOGI("%s: DFS-MKK4 domain", __func__);
rinfo.dfsdomain = DFS_MKK4_DOMAIN;
case DFS_MKK_REGION:
WMA_LOGI("%s: DFS-MKK domain", __func__);
rinfo.dfsdomain = DFS_MKK_REGION;
rinfo.dfs_radars = dfs_mkk4_radars;
rinfo.numradars = QDF_ARRAY_SIZE(dfs_mkk4_radars);
rinfo.b5pulses = dfs_jpn_bin5pulses;
@ -6034,7 +6034,7 @@ void wma_dfs_configure(struct ieee80211com *ic)
break;
default:
WMA_LOGI("%s: DFS-UNINT domain", __func__);
rinfo.dfsdomain = DFS_UNINIT_DOMAIN;
rinfo.dfsdomain = DFS_UNINIT_REGION;
rinfo.dfs_radars = NULL;
rinfo.numradars = 0;
rinfo.b5pulses = NULL;
@ -6190,9 +6190,9 @@ struct dfs_ieee80211_channel *wma_dfs_configure_channel(
void wma_set_dfs_region(tp_wma_handle wma, uint8_t dfs_region)
{
/* dfs information is passed */
if (dfs_region > DFS_MKK4_DOMAIN || dfs_region == DFS_UNINIT_DOMAIN)
/* assign DFS_FCC_DOMAIN as default domain*/
wma->dfs_ic->current_dfs_regdomain = DFS_FCC_DOMAIN;
if (dfs_region > DFS_MKK_REGION || dfs_region == DFS_UNINIT_REGION)
/* assign DFS_FCC_REGION as default region*/
wma->dfs_ic->current_dfs_regdomain = DFS_FCC_REGION;
else
wma->dfs_ic->current_dfs_regdomain = dfs_region;