lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Add API to convert phymode types

Browse Source 
Convert CSR phymode to regulatory phymode and back. Regulatory
phymode enum contains fewer fields than eCsrPhyMode enum so a
conversion API is needed.

Change-Id: I4b962c07a917d19fa4ae51c78befae507dabf80f
CRs-fixed: 2658294
This commit is contained in:
Lincoln Tran 2020-05-01 15:16:08 -07:00 committed by nshrivas
parent b669e9b7ea
commit ffd5db1bb9
2 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/sme/inc/csr_api.h
View File

@ -1419,4 +1419,29 @@ void
csr_update_pmf_cap_from_connected_profile(tCsrRoamConnectedProfile *profile,
struct scan_filter *filter);
#endif
/*
* csr_convert_to_reg_phy_mode() - CSR API to convert CSR phymode into
* regulatory phymode
* @csr_phy_mode: csr phymode with type eCsrPhyMode
* @freq: current operating frequency
*
* This API is used to convert a phymode from CSR to a phymode from regulatory
*
* Return: regulatory phymode that is comparable to input
*/
enum reg_phymode csr_convert_to_reg_phy_mode(eCsrPhyMode csr_phy_mode,
qdf_freq_t freq);
/*
* csr_convert_from_reg_phy_mode() - CSR API to convert regulatory phymode into
* CSR phymode
* @reg_phymode: regulatory phymode
*
* This API is used to convert a regulatory phymode to a CSR phymode
*
* Return: eCSR phymode that is comparable to input
*/
eCsrPhyMode csr_convert_from_reg_phy_mode(enum reg_phymode phymode);
#endif

57
core/sme/src/csr/csr_util.c
View File

@ -1988,6 +1988,63 @@ enum csr_cfgdot11mode csr_find_best_phy_mode(struct mac_context *mac,
return cfgDot11ModeToUse;
}
enum reg_phymode csr_convert_to_reg_phy_mode(eCsrPhyMode csr_phy_mode,
qdf_freq_t freq)
{
if (csr_phy_mode == eCSR_DOT11_MODE_AUTO)
return REG_PHYMODE_MAX - 1;
else if (csr_phy_mode == eCSR_DOT11_MODE_11ax ||
csr_phy_mode == eCSR_DOT11_MODE_11ax_ONLY)
return REG_PHYMODE_11AX;
else if (csr_phy_mode == eCSR_DOT11_MODE_11ac ||
csr_phy_mode == eCSR_DOT11_MODE_11ac_ONLY)
return REG_PHYMODE_11AC;
else if (csr_phy_mode == eCSR_DOT11_MODE_11n ||
csr_phy_mode == eCSR_DOT11_MODE_11n_ONLY)
return REG_PHYMODE_11N;
else if (csr_phy_mode == eCSR_DOT11_MODE_11a)
return REG_PHYMODE_11A;
else if (csr_phy_mode == eCSR_DOT11_MODE_11g ||
csr_phy_mode == eCSR_DOT11_MODE_11g_ONLY)
return REG_PHYMODE_11G;
else if (csr_phy_mode == eCSR_DOT11_MODE_11b ||
csr_phy_mode == eCSR_DOT11_MODE_11b_ONLY)
return REG_PHYMODE_11B;
else if (csr_phy_mode == eCSR_DOT11_MODE_abg) {
if (WLAN_REG_IS_24GHZ_CH_FREQ(freq))
return REG_PHYMODE_11G;
else
return REG_PHYMODE_11A;
} else {
sme_err("Invalid eCsrPhyMode");
return REG_PHYMODE_INVALID;
}
}
eCsrPhyMode csr_convert_from_reg_phy_mode(enum reg_phymode phymode)
{
switch (phymode) {
case REG_PHYMODE_INVALID:
return eCSR_DOT11_MODE_AUTO;
case REG_PHYMODE_11B:
return eCSR_DOT11_MODE_11b;
case REG_PHYMODE_11G:
return eCSR_DOT11_MODE_11g;
case REG_PHYMODE_11A:
return eCSR_DOT11_MODE_11a;
case REG_PHYMODE_11N:
return eCSR_DOT11_MODE_11n;
case REG_PHYMODE_11AC:
return eCSR_DOT11_MODE_11ac;
case REG_PHYMODE_11AX:
return eCSR_DOT11_MODE_11ax;
case REG_PHYMODE_MAX:
return eCSR_DOT11_MODE_AUTO;
default:
return eCSR_DOT11_MODE_AUTO;
}
}
uint32_t csr_get11h_power_constraint(struct mac_context *mac_ctx,
tDot11fIEPowerConstraints *constraints)
{