samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Rename pMac in CFG

Browse Source 
Per the Linux coding style "mixed-case names are frowned upon" and
"so-called Hungarian notation [...] is brain damaged." One identifier
used extensively throughout the driver that violates both of these
tenants is "pMac." In order to be compliant with the Linux coding
style there is a campaign to rename all instances of this identifier.

For this change rename all instances of "pMac" to "mac" in:
cfg_api.c
cfg_proc_msg.c
cfg_send_msg.c
cfg_api.h

Change-Id: I20ea98409b365229fb1c1f1330072118cb410dca
CRs-Fixed: 2356106
This commit is contained in:
Jeff Johnson
2018-11-22 09:40:23 -08:00
committed by nshrivas
parent 1fb8d88e99
commit 5b6789c154
4 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
core/mac/src/cfg/cfg_api.c
View File

@@ -52,16 +52,16 @@ extern cfgstatic_string cfg_static_string[CFG_MAX_STATIC_STRING];
extern cgstatic cfg_static[CFG_PARAM_MAX_NUM];
/* --------------------------------------------------------------------- */
uint32_t cfg_need_restart(tpAniSirGlobal pMac, uint16_t cfgId)
uint32_t cfg_need_restart(tpAniSirGlobal mac, uint16_t cfgId)
{
if (!pMac->cfg.gCfgEntry) {
if (!mac->cfg.gCfgEntry) {
pe_err("gCfgEntry is NULL");
return 0;
}
return !!(pMac->cfg.gCfgEntry[cfgId].control & CFG_CTL_RESTART);
return !!(mac->cfg.gCfgEntry[cfgId].control & CFG_CTL_RESTART);
}
static void cfg_get_strindex(tpAniSirGlobal pMac, uint16_t cfgId)
static void cfg_get_strindex(tpAniSirGlobal mac, uint16_t cfgId)
{
uint16_t i = 0;
@@ -77,17 +77,17 @@ static void cfg_get_strindex(tpAniSirGlobal pMac, uint16_t cfgId)
cfg_static[cfgId].pStrData = &cfg_static_string[i];
}
/* --------------------------------------------------------------------- */
uint32_t cfg_need_reload(tpAniSirGlobal pMac, uint16_t cfgId)
uint32_t cfg_need_reload(tpAniSirGlobal mac, uint16_t cfgId)
{
if (!pMac->cfg.gCfgEntry) {
if (!mac->cfg.gCfgEntry) {
pe_err("gCfgEntry is NULL");
return 0;
}
return !!(pMac->cfg.gCfgEntry[cfgId].control & CFG_CTL_RELOAD);
return !!(mac->cfg.gCfgEntry[cfgId].control & CFG_CTL_RELOAD);
}
/* --------------------------------------------------------------------- */
QDF_STATUS cfg_init(tpAniSirGlobal pMac)
QDF_STATUS cfg_init(tpAniSirGlobal mac)
{
uint16_t i = 0;
uint16_t combined_buff_size = 0;
@@ -95,13 +95,13 @@ QDF_STATUS cfg_init(tpAniSirGlobal pMac)
uint32_t max_s_count = 0;
cfgstatic_string *str_cfg;
pMac->cfg.gSBuffer = __g_s_buffer;
pMac->cfg.gCfgEntry = __g_cfg_entry;
pMac->cfg.gParamList = __g_param_list;
mac->cfg.gSBuffer = __g_s_buffer;
mac->cfg.gCfgEntry = __g_cfg_entry;
mac->cfg.gParamList = __g_param_list;
for (i = 0; i < CFG_PARAM_MAX_NUM; i++) {
if (!(cfg_static[i].control & CFG_CTL_INT)) {
cfg_get_strindex(pMac, i);
cfg_get_strindex(mac, i);
} else {
cfg_static[i].pStrData = NULL;
}
@@ -121,8 +121,8 @@ QDF_STATUS cfg_init(tpAniSirGlobal pMac)
}
}
pMac->cfg.gCfgMaxIBufSize = max_i_count;
pMac->cfg.gCfgMaxSBufSize = max_s_count;
mac->cfg.gCfgMaxIBufSize = max_i_count;
mac->cfg.gCfgMaxSBufSize = max_s_count;
/* Allocate a combined memory */
combined_buff_size = max_s_count + (3 * sizeof(uint32_t) * max_i_count);
@@ -136,32 +136,32 @@ QDF_STATUS cfg_init(tpAniSirGlobal pMac)
pe_err("Mem alloc request too big");
return QDF_STATUS_E_NOMEM;
}
/* at this point pMac->cfg.gCfgSBuf starts */
pMac->cfg.gCfgSBuf = qdf_mem_malloc(combined_buff_size);
if (!pMac->cfg.gCfgSBuf)
/* at this point mac->cfg.gCfgSBuf starts */
mac->cfg.gCfgSBuf = qdf_mem_malloc(combined_buff_size);
if (!mac->cfg.gCfgSBuf)
return QDF_STATUS_E_NOMEM;
/* at offset max_s_count, pMac->cfg.gCfgIBuf starts */
pMac->cfg.gCfgIBuf = (uint32_t *)&pMac->cfg.gCfgSBuf[max_s_count];
/* after max_i_count integers, pMac->cfg.gCfgIBufMin starts */
pMac->cfg.gCfgIBufMin = &pMac->cfg.gCfgIBuf[max_i_count];
/* after max_i_count integers, pMac->cfg.gCfgIBufMax starts */
pMac->cfg.gCfgIBufMax = &pMac->cfg.gCfgIBufMin[max_i_count];
/* at offset max_s_count, mac->cfg.gCfgIBuf starts */
mac->cfg.gCfgIBuf = (uint32_t *)&mac->cfg.gCfgSBuf[max_s_count];
/* after max_i_count integers, mac->cfg.gCfgIBufMin starts */
mac->cfg.gCfgIBufMin = &mac->cfg.gCfgIBuf[max_i_count];
/* after max_i_count integers, mac->cfg.gCfgIBufMax starts */
mac->cfg.gCfgIBufMax = &mac->cfg.gCfgIBufMin[max_i_count];
return QDF_STATUS_SUCCESS;
}
/* ---------------------------------------------------------------------- */
void cfg_de_init(tpAniSirGlobal pMac)
void cfg_de_init(tpAniSirGlobal mac)
{
qdf_mem_free(pMac->cfg.gCfgSBuf);
pMac->cfg.gCfgIBufMin = NULL;
pMac->cfg.gCfgIBufMax = NULL;
pMac->cfg.gCfgIBuf = NULL;
pMac->cfg.gCfgSBuf = NULL;
pMac->cfg.gSBuffer = NULL;
pMac->cfg.gCfgEntry = NULL;
pMac->cfg.gParamList = NULL;
qdf_mem_free(mac->cfg.gCfgSBuf);
mac->cfg.gCfgIBufMin = NULL;
mac->cfg.gCfgIBufMax = NULL;
mac->cfg.gCfgIBuf = NULL;
mac->cfg.gCfgSBuf = NULL;
mac->cfg.gSBuffer = NULL;
mac->cfg.gCfgEntry = NULL;
mac->cfg.gParamList = NULL;
}
/* --------------------------------------------------------------------- */
@@ -182,7 +182,7 @@ void cfg_de_init(tpAniSirGlobal pMac)
* @return QDF_STATUS_SUCCESS: request completed successfully
* @return QDF_STATUS_E_INVAL: invalid CFG parameter ID
*/
QDF_STATUS cfg_check_valid(tpAniSirGlobal pMac, uint16_t cfgId,
QDF_STATUS cfg_check_valid(tpAniSirGlobal mac, uint16_t cfgId,
uint32_t *index)
{
uint32_t control;
@@ -191,12 +191,12 @@ QDF_STATUS cfg_check_valid(tpAniSirGlobal pMac, uint16_t cfgId,
pe_warn("Invalid cfg id: %d", cfgId);
return QDF_STATUS_E_INVAL;
}
if (!pMac->cfg.gCfgEntry) {
if (!mac->cfg.gCfgEntry) {
pe_warn("gCfgEntry is NULL");
return QDF_STATUS_E_INVAL;
}
control = pMac->cfg.gCfgEntry[cfgId].control;
control = mac->cfg.gCfgEntry[cfgId].control;
/* Check if parameter is valid */
if ((control & CFG_CTL_VALID) == 0) {
@@ -206,7 +206,7 @@ QDF_STATUS cfg_check_valid(tpAniSirGlobal pMac, uint16_t cfgId,
*index = control & CFG_BUF_INDX_MASK;
if (*index >= pMac->cfg.gCfgMaxSBufSize) {
if (*index >= mac->cfg.gCfgMaxSBufSize) {
pe_warn("cfg index out of bounds: %d", *index);
return QDF_STATUS_E_INVAL;
}
@@ -242,37 +242,37 @@ QDF_STATUS cfg_check_valid(tpAniSirGlobal pMac, uint16_t cfgId,
* @return QDF_STATUS_E_INVAL: invalid CFG parameter ID
*/
QDF_STATUS cfg_set_int(tpAniSirGlobal pMac, uint16_t cfgId, uint32_t value)
QDF_STATUS cfg_set_int(tpAniSirGlobal mac, uint16_t cfgId, uint32_t value)
{
uint32_t index;
uint32_t control;
uint32_t mask;
QDF_STATUS status;
status = cfg_check_valid(pMac, cfgId, &index);
status = cfg_check_valid(mac, cfgId, &index);
if (QDF_STATUS_SUCCESS != status)
return status;
if ((pMac->cfg.gCfgIBufMin[index] > value) ||
(pMac->cfg.gCfgIBufMax[index] < value)) {
if ((mac->cfg.gCfgIBufMin[index] > value) ||
(mac->cfg.gCfgIBufMax[index] < value)) {
pe_warn("Value: %d out of range: [%d,%d] cfg id: %d, %s",
value, pMac->cfg.gCfgIBufMin[index],
pMac->cfg.gCfgIBufMax[index], cfgId,
value, mac->cfg.gCfgIBufMin[index],
mac->cfg.gCfgIBufMax[index], cfgId,
cfg_get_string(cfgId));
return QDF_STATUS_E_INVAL;
} else {
/* Write integer value */
pMac->cfg.gCfgIBuf[index] = value;
mac->cfg.gCfgIBuf[index] = value;
control = pMac->cfg.gCfgEntry[cfgId].control;
control = mac->cfg.gCfgEntry[cfgId].control;
/* Update hardware if necessary */
mask = control & CFG_CTL_NTF_MASK;
if ((mask & CFG_CTL_NTF_HW) != 0)
pe_debug("CFG notify HW not supported!!!");
/* notify other modules if necessary */
if ((mask & CFG_CTL_NTF_MASK) != 0)
notify(pMac, cfgId, mask);
notify(mac, cfgId, mask);
}
return status;
} /*** end cfg_set_int ***/
@@ -297,19 +297,19 @@ QDF_STATUS cfg_set_int(tpAniSirGlobal pMac, uint16_t cfgId, uint32_t value)
* @return QDF_STATUS_E_INVAL: invalid CFG parameter ID
*/
QDF_STATUS wlan_cfg_get_int(tpAniSirGlobal pMac, uint16_t cfgId,
QDF_STATUS wlan_cfg_get_int(tpAniSirGlobal mac, uint16_t cfgId,
uint32_t *pValue)
{
uint32_t index;
QDF_STATUS status;
status = cfg_check_valid(pMac, cfgId, &index);
status = cfg_check_valid(mac, cfgId, &index);
if (QDF_STATUS_SUCCESS != status)
return status;
/* Get integer value */
*pValue = pMac->cfg.gCfgIBuf[index];
*pValue = mac->cfg.gCfgIBuf[index];
return QDF_STATUS_SUCCESS;
} /*** end wlan_cfg_get_int() ***/
@@ -343,10 +343,10 @@ QDF_STATUS wlan_cfg_get_int(tpAniSirGlobal pMac, uint16_t cfgId,
*
*/
QDF_STATUS cfg_set_str(tpAniSirGlobal pMac, uint16_t cfgId, uint8_t *pStr,
QDF_STATUS cfg_set_str(tpAniSirGlobal mac, uint16_t cfgId, uint8_t *pStr,
uint32_t length)
{
return cfg_set_str_notify(pMac, cfgId, pStr, length, true);
return cfg_set_str_notify(mac, cfgId, pStr, length, true);
}
/* --------------------------------------------------------------------- */
@@ -377,7 +377,7 @@ QDF_STATUS cfg_set_str(tpAniSirGlobal pMac, uint16_t cfgId, uint8_t *pStr,
*
*/
QDF_STATUS cfg_set_str_notify(tpAniSirGlobal pMac, uint16_t cfgId,
QDF_STATUS cfg_set_str_notify(tpAniSirGlobal mac, uint16_t cfgId,
uint8_t *pStr, uint32_t length,
int notifyMod)
{
@@ -386,14 +386,14 @@ QDF_STATUS cfg_set_str_notify(tpAniSirGlobal pMac, uint16_t cfgId,
uint32_t control;
QDF_STATUS status;
status = cfg_check_valid(pMac, cfgId, &index);
status = cfg_check_valid(mac, cfgId, &index);
if (QDF_STATUS_SUCCESS != status)
return status;
pDst = &pMac->cfg.gCfgSBuf[index];
pDst = &mac->cfg.gCfgSBuf[index];
paramLen = *pDst++;
control = pMac->cfg.gCfgEntry[cfgId].control;
control = mac->cfg.gCfgEntry[cfgId].control;
if (length > paramLen) {
pe_warn("Invalid length: %d (>%d) cfg id: %d",
length, paramLen, cfgId);
@@ -412,7 +412,7 @@ QDF_STATUS cfg_set_str_notify(tpAniSirGlobal pMac, uint16_t cfgId,
}
/* notify other modules if necessary */
if ((mask & CFG_CTL_NTF_MASK) != 0) {
notify(pMac, cfgId, mask);
notify(mac, cfgId, mask);
}
}
}
@@ -445,20 +445,20 @@ QDF_STATUS cfg_set_str_notify(tpAniSirGlobal pMac, uint16_t cfgId,
*
*/
QDF_STATUS wlan_cfg_get_str(tpAniSirGlobal pMac, uint16_t cfgId,
QDF_STATUS wlan_cfg_get_str(tpAniSirGlobal mac, uint16_t cfgId,
uint8_t *pBuf, uint32_t *pLength)
{
uint8_t *pSrc, *pSrcEnd;
uint32_t index;
QDF_STATUS status;
status = cfg_check_valid(pMac, cfgId, &index);
status = cfg_check_valid(mac, cfgId, &index);
if (QDF_STATUS_SUCCESS != status)
return status;
/* Get string */
pSrc = &pMac->cfg.gCfgSBuf[index];
pSrc = &mac->cfg.gCfgSBuf[index];
pSrc++; /* skip over max length */
if (*pLength < *pSrc) {
pe_warn("Invalid length: %d (<%d) cfg id: %d",
@@ -496,18 +496,18 @@ QDF_STATUS wlan_cfg_get_str(tpAniSirGlobal pMac, uint16_t cfgId,
*
*/
QDF_STATUS wlan_cfg_get_str_max_len(tpAniSirGlobal pMac, uint16_t cfgId,
QDF_STATUS wlan_cfg_get_str_max_len(tpAniSirGlobal mac, uint16_t cfgId,
uint32_t *pLength)
{
uint32_t index;
QDF_STATUS status;
status = cfg_check_valid(pMac, cfgId, &index);
status = cfg_check_valid(mac, cfgId, &index);
if (QDF_STATUS_SUCCESS != status)
return status;
*pLength = pMac->cfg.gCfgSBuf[index];
*pLength = mac->cfg.gCfgSBuf[index];
return status;
} /*** end wlan_cfg_get_str_max_len() ***/
@@ -535,18 +535,18 @@ QDF_STATUS wlan_cfg_get_str_max_len(tpAniSirGlobal pMac, uint16_t cfgId,
*
*/
QDF_STATUS wlan_cfg_get_str_len(tpAniSirGlobal pMac, uint16_t cfgId,
QDF_STATUS wlan_cfg_get_str_len(tpAniSirGlobal mac, uint16_t cfgId,
uint32_t *pLength)
{
uint32_t index;
QDF_STATUS status;
status = cfg_check_valid(pMac, cfgId, &index);
status = cfg_check_valid(mac, cfgId, &index);
if (QDF_STATUS_SUCCESS != status)
return status;
*pLength = pMac->cfg.gCfgSBuf[index + 1];
*pLength = mac->cfg.gCfgSBuf[index + 1];
return status;
@@ -554,7 +554,7 @@ QDF_STATUS wlan_cfg_get_str_len(tpAniSirGlobal pMac, uint16_t cfgId,
/**
* cfg_get_dot11d_transmit_power() - regulatory max transmit power
* @pMac: pointer to mac data
* @mac: pointer to mac data
* @cfgId: configuration ID
* @cfgLength: configuration length
* @channel: channel number
@@ -562,7 +562,7 @@ QDF_STATUS wlan_cfg_get_str_len(tpAniSirGlobal pMac, uint16_t cfgId,
* Return: int8_t - power
*/
static int8_t
cfg_get_dot11d_transmit_power(tpAniSirGlobal pMac, uint16_t cfgId,
cfg_get_dot11d_transmit_power(tpAniSirGlobal mac, uint16_t cfgId,
uint32_t cfgLength, uint8_t channel)
{
uint8_t *pCountryInfo = NULL;
@@ -583,7 +583,7 @@ cfg_get_dot11d_transmit_power(tpAniSirGlobal pMac, uint16_t cfgId,
/* The CSR will always update this CFG. The contents will be from country IE if regulatory domain
* is enabled on AP else will contain EEPROM contents
*/
if (wlan_cfg_get_str(pMac, cfgId, pCountryInfo, &cfgLength) !=
if (wlan_cfg_get_str(mac, cfgId, pCountryInfo, &cfgLength) !=
QDF_STATUS_SUCCESS) {
qdf_mem_free(pCountryInfo);
pCountryInfo = NULL;
@@ -621,7 +621,7 @@ error:
\param channel
\param rfBand
-----------------------------------------------------------------------*/
int8_t cfg_get_regulatory_max_transmit_power(tpAniSirGlobal pMac,
int8_t cfg_get_regulatory_max_transmit_power(tpAniSirGlobal mac,
uint8_t channel)
{
uint32_t cfgLength = 0;
@@ -655,7 +655,7 @@ int8_t cfg_get_regulatory_max_transmit_power(tpAniSirGlobal pMac,
return WMA_MAX_TXPOWER_INVALID; /* Its return, not break. */
}
maxTxPwr = cfg_get_dot11d_transmit_power(pMac, cfgId, cfgLength, channel);
maxTxPwr = cfg_get_dot11d_transmit_power(mac, cfgId, cfgLength, channel);
return maxTxPwr;
}
@@ -676,7 +676,7 @@ int8_t cfg_get_regulatory_max_transmit_power(tpAniSirGlobal pMac,
* @return None
*/
QDF_STATUS cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
QDF_STATUS cfg_get_capability_info(tpAniSirGlobal mac, uint16_t *pCap,
struct pe_session *sessionEntry)
{
uint32_t val = 0;
@@ -701,15 +701,15 @@ QDF_STATUS cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
val = sessionEntry->privacy;
} else {
/* PRIVACY bit */
val = pMac->mlme_cfg->wep_params.is_privacy_enabled;
val = mac->mlme_cfg->wep_params.is_privacy_enabled;
}
if (val)
pCapInfo->privacy = 1;
/* Short preamble bit */
if (pMac->mlme_cfg->ht_caps.short_preamble)
if (mac->mlme_cfg->ht_caps.short_preamble)
pCapInfo->shortPreamble =
pMac->mlme_cfg->ht_caps.short_preamble;
mac->mlme_cfg->ht_caps.short_preamble;
/* PBCC bit */
pCapInfo->pbcc = 0;
@@ -738,7 +738,7 @@ QDF_STATUS cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
* deleting the previous IBSS or in start BSS as part
* of coalescing
*/
if (pMac->mlme_cfg->feature_flags.enable_short_slot_time_11g) {
if (mac->mlme_cfg->feature_flags.enable_short_slot_time_11g) {
pCapInfo->shortSlotTime =
sessionEntry->shortSlotTimeSupported;
}
@@ -746,7 +746,7 @@ QDF_STATUS cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
/* Spectrum Management bit */
if (!LIM_IS_IBSS_ROLE(sessionEntry) && sessionEntry->lim11hEnable) {
if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) !=
if (wlan_cfg_get_int(mac, WNI_CFG_11H_ENABLED, &val) !=
QDF_STATUS_SUCCESS) {
pe_err("cfg get WNI_CFG_11H_ENABLED failed");
return QDF_STATUS_E_FAILURE;
@@ -755,11 +755,11 @@ QDF_STATUS cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
pCapInfo->spectrumMgt = 1;
}
/* QoS bit */
if (pMac->mlme_cfg->wmm_params.qos_enabled)
if (mac->mlme_cfg->wmm_params.qos_enabled)
pCapInfo->qos = 1;
/* APSD bit */
if (wlan_cfg_get_int(pMac, WNI_CFG_APSD_ENABLED, &val) !=
if (wlan_cfg_get_int(mac, WNI_CFG_APSD_ENABLED, &val) !=
QDF_STATUS_SUCCESS) {
pe_err("cfg get WNI_CFG_APSD_ENABLED failed");
return QDF_STATUS_E_FAILURE;
@@ -767,13 +767,13 @@ QDF_STATUS cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
if (val)
pCapInfo->apsd = 1;
pCapInfo->rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;
pCapInfo->rrm = mac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;
pe_debug("RRM: %d", pCapInfo->rrm);
/* DSSS-OFDM */
/* FIXME : no config defined yet. */
/* Block ack bit */
val = pMac->mlme_cfg->feature_flags.enable_block_ack;
val = mac->mlme_cfg->feature_flags.enable_block_ack;
pCapInfo->delayedBA =
(uint16_t) ((val >> WNI_CFG_BLOCK_ACK_ENABLED_DELAYED) & 1);
pCapInfo->immediateBA =
@@ -798,12 +798,12 @@ QDF_STATUS cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
* 2. Since PBCC, Channel agility and Extended capabilities
* are not supported, they're not set at CFG
*
* @param pMac Pointer to global MAC structure
* @param mac Pointer to global MAC structure
* @param caps 16-bit Capability Info field
* @return None
*/
void cfg_set_capability_info(tpAniSirGlobal pMac, uint16_t caps)
void cfg_set_capability_info(tpAniSirGlobal mac, uint16_t caps)
{
}
@@ -828,10 +828,10 @@ void cfg_set_capability_info(tpAniSirGlobal pMac, uint16_t caps)
*
*/
void cfg_cleanup(tpAniSirGlobal pMac)
void cfg_cleanup(tpAniSirGlobal mac)
{
/* Set status to not-ready */
pMac->cfg.gCfgStatus = CFG_INCOMPLETE;
mac->cfg.gCfgStatus = CFG_INCOMPLETE;
} /*** end CfgCleanup() ***/
@@ -855,7 +855,7 @@ void cfg_cleanup(tpAniSirGlobal pMac)
*
*/
static void notify(tpAniSirGlobal pMac, uint16_t cfgId, uint32_t ntfMask)
static void notify(tpAniSirGlobal mac, uint16_t cfgId, uint32_t ntfMask)
{
struct scheduler_msg mmhMsg = {0};
@@ -865,13 +865,13 @@ static void notify(tpAniSirGlobal pMac, uint16_t cfgId, uint32_t ntfMask)
mmhMsg.bodyptr = NULL;
if ((ntfMask & CFG_CTL_NTF_SCH) != 0)
sch_post_message(pMac, &mmhMsg);
sch_post_message(mac, &mmhMsg);
if ((ntfMask & CFG_CTL_NTF_LIM) != 0)
lim_post_msg_api(pMac, &mmhMsg);
lim_post_msg_api(mac, &mmhMsg);
if ((ntfMask & CFG_CTL_NTF_TARGET) != 0)
wma_post_ctrl_msg(pMac, &mmhMsg);
wma_post_ctrl_msg(mac, &mmhMsg);
/* notify ARQ */

152
core/mac/src/cfg/cfg_proc_msg.c
View File

@@ -245,7 +245,7 @@ void (*g_cfg_func[])(tpAniSirGlobal, uint16_t, uint32_t *) = {
* @return None.
*
*/
void cfg_process_mb_msg(tpAniSirGlobal pMac, tSirMbMsg *pMsg)
void cfg_process_mb_msg(tpAniSirGlobal mac, tSirMbMsg *pMsg)
{
uint16_t index;
uint16_t len;
@@ -262,7 +262,7 @@ void cfg_process_mb_msg(tpAniSirGlobal pMac, tSirMbMsg *pMsg)
pParam = ((uint32_t *) pMsg) + 1;
/* Call processing function */
g_cfg_func[index] (pMac, len, pParam);
g_cfg_func[index] (mac, len, pParam);
/* Free up buffer */
qdf_mem_free(pMsg);
@@ -287,7 +287,7 @@ void cfg_process_mb_msg(tpAniSirGlobal pMac, tSirMbMsg *pMsg)
* @return None
*
*/
static void proc_dnld_rsp(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam)
static void proc_dnld_rsp(tpAniSirGlobal mac, uint16_t length, uint32_t *pParam)
{
int32_t i;
@@ -321,17 +321,17 @@ static void proc_dnld_rsp(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam
pParam += (sizeof(tCfgBinHdr) >> 2);
pe_debug("CFG hdr totParams: %d intParams: %d strBufSize: %d/%d",
pHdr->controlSize, pHdr->iBufSize, pHdr->sBufSize,
pMac->cfg.gCfgMaxSBufSize);
mac->cfg.gCfgMaxSBufSize);
if (pHdr->sBufSize > (UINT_MAX -
(((CFG_PARAM_MAX_NUM + 3 * pMac->cfg.gCfgMaxIBufSize) << 2) +
(((CFG_PARAM_MAX_NUM + 3 * mac->cfg.gCfgMaxIBufSize) << 2) +
sizeof(tCfgBinHdr)))) {
pe_warn("Invalid sBufSize coming from fw: %d", pHdr->sBufSize);
retVal = WNI_CFG_INVALID_LEN;
goto end;
}
expLen =
((CFG_PARAM_MAX_NUM + 3 * pMac->cfg.gCfgMaxIBufSize) << 2) +
((CFG_PARAM_MAX_NUM + 3 * mac->cfg.gCfgMaxIBufSize) << 2) +
pHdr->sBufSize + sizeof(tCfgBinHdr);
if (length != expLen) {
@@ -347,62 +347,62 @@ static void proc_dnld_rsp(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam
goto end;
}
if (pHdr->iBufSize != pMac->cfg.gCfgMaxIBufSize) {
if (pHdr->iBufSize != mac->cfg.gCfgMaxIBufSize) {
pe_warn("<CFG> Integer parameter count mismatch");
retVal = WNI_CFG_INVALID_LEN;
goto end;
}
/* Copy control array */
pDst = (uint32_t *) pMac->cfg.gCfgEntry;
pDst = (uint32_t *) mac->cfg.gCfgEntry;
pDstEnd = pDst + CFG_PARAM_MAX_NUM;
pSrc = pParam;
while (pDst < pDstEnd) {
*pDst++ = *pSrc++;
}
/* Copy default values */
pDst = pMac->cfg.gCfgIBuf;
pDstEnd = pDst + pMac->cfg.gCfgMaxIBufSize;
pDst = mac->cfg.gCfgIBuf;
pDstEnd = pDst + mac->cfg.gCfgMaxIBufSize;
while (pDst < pDstEnd) {
*pDst++ = *pSrc++;
}
/* Copy min values */
pDst = pMac->cfg.gCfgIBufMin;
pDstEnd = pDst + pMac->cfg.gCfgMaxIBufSize;
pDst = mac->cfg.gCfgIBufMin;
pDstEnd = pDst + mac->cfg.gCfgMaxIBufSize;
while (pDst < pDstEnd) {
*pDst++ = *pSrc++;
}
/* Copy max values */
pDst = pMac->cfg.gCfgIBufMax;
pDstEnd = pDst + pMac->cfg.gCfgMaxIBufSize;
pDst = mac->cfg.gCfgIBufMax;
pDstEnd = pDst + mac->cfg.gCfgMaxIBufSize;
while (pDst < pDstEnd) {
*pDst++ = *pSrc++;
}
for (i = 0; i < pMac->cfg.gCfgMaxIBufSize; i++)
if (pMac->cfg.gCfgIBuf[i] < pMac->cfg.gCfgIBufMin[i] ||
pMac->cfg.gCfgIBuf[i] > pMac->cfg.gCfgIBufMax[i]) {
for (i = 0; i < mac->cfg.gCfgMaxIBufSize; i++)
if (mac->cfg.gCfgIBuf[i] < mac->cfg.gCfgIBufMin[i] ||
mac->cfg.gCfgIBuf[i] > mac->cfg.gCfgIBufMax[i]) {
pe_debug("cfg id: %d Invalid def value: %d min: %d max: %d",
i, pMac->cfg.gCfgIBuf[i],
pMac->cfg.gCfgIBufMin[i],
pMac->cfg.gCfgIBufMax[i]);
i, mac->cfg.gCfgIBuf[i],
mac->cfg.gCfgIBufMin[i],
mac->cfg.gCfgIBufMax[i]);
}
/* Calculate max string buffer lengths for all string parameters */
bufEnd = pMac->cfg.gCfgMaxSBufSize;
bufEnd = mac->cfg.gCfgMaxSBufSize;
for (i = CFG_PARAM_MAX_NUM - 1; i >= 0; i--) {
if ((pMac->cfg.gCfgEntry[i].control & CFG_CTL_INT) != 0)
if ((mac->cfg.gCfgEntry[i].control & CFG_CTL_INT) != 0)
continue;
if ((pMac->cfg.gCfgEntry[i].control & CFG_CTL_VALID) == 0)
if ((mac->cfg.gCfgEntry[i].control & CFG_CTL_VALID) == 0)
continue;
bufStart = pMac->cfg.gCfgEntry[i].control & CFG_BUF_INDX_MASK;
pMac->cfg.gCfgSBuf[bufStart] =
bufStart = mac->cfg.gCfgEntry[i].control & CFG_BUF_INDX_MASK;
mac->cfg.gCfgSBuf[bufStart] =
(uint8_t) (bufEnd - bufStart - 2);
pe_debug("id: %d max: %d bufStart: %d bufEnd: %d", i,
pMac->cfg.gCfgSBuf[bufStart], bufStart, bufEnd);
mac->cfg.gCfgSBuf[bufStart], bufStart, bufEnd);
bufEnd = bufStart;
}
@@ -443,7 +443,7 @@ static void proc_dnld_rsp(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam
pe_debug("set str id: %d len: %d", paramId, paramLen);
if (cfg_set_str(pMac, (uint16_t) paramId, pStr, paramLen) !=
if (cfg_set_str(mac, (uint16_t) paramId, pStr, paramLen) !=
QDF_STATUS_SUCCESS) {
pe_warn("setting str default param %d len %d",
paramId, paramLen);
@@ -453,27 +453,27 @@ static void proc_dnld_rsp(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam
}
/* Set status to READY */
pMac->cfg.gCfgStatus = CFG_SUCCESS;
mac->cfg.gCfgStatus = CFG_SUCCESS;
retVal = WNI_CFG_SUCCESS;
pe_debug("<CFG> Completed successfully");
end:
if (retVal != WNI_CFG_SUCCESS)
pMac->cfg.gCfgStatus = CFG_FAILURE;
mac->cfg.gCfgStatus = CFG_FAILURE;
/* Send response message to host */
pMac->cfg.gParamList[WNI_CFG_DNLD_CNF_RES] = retVal;
cfg_send_host_msg(pMac, WNI_CFG_DNLD_CNF, WNI_CFG_DNLD_CNF_LEN,
WNI_CFG_DNLD_CNF_NUM, pMac->cfg.gParamList, 0, 0);
mac->cfg.gParamList[WNI_CFG_DNLD_CNF_RES] = retVal;
cfg_send_host_msg(mac, WNI_CFG_DNLD_CNF, WNI_CFG_DNLD_CNF_LEN,
WNI_CFG_DNLD_CNF_NUM, mac->cfg.gParamList, 0, 0);
/* notify WMA that the config has downloaded */
mmhMsg.type = SIR_CFG_DOWNLOAD_COMPLETE_IND;
mmhMsg.bodyptr = NULL;
mmhMsg.bodyval = 0;
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, mmhMsg.type));
if (wma_post_ctrl_msg(pMac, &mmhMsg) != QDF_STATUS_SUCCESS) {
MTRACE(mac_trace_msg_tx(mac, NO_SESSION, mmhMsg.type));
if (wma_post_ctrl_msg(mac, &mmhMsg) != QDF_STATUS_SUCCESS) {
pe_err("WMAPostMsgApi failed!");
}
@@ -499,7 +499,7 @@ end:
* @return None
*
*/
static void proc_get_req(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam)
static void proc_get_req(tpAniSirGlobal mac, uint16_t length, uint32_t *pParam)
{
uint16_t cfgId, i;
uint32_t value, valueLen, result;
@@ -509,16 +509,16 @@ static void proc_get_req(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam)
for (i = 0; i < length / 4; i++)
pe_debug("[%2d] 0x%08x", i, pParam[i]);
if (!pMac->cfg.gCfgStatus) {
if (!mac->cfg.gCfgStatus) {
cfgId = (uint16_t) sir_read_u32_n((uint8_t *) pParam);
pe_debug("CFG not ready, param %d", cfgId);
pMac->cfg.gParamList[WNI_CFG_GET_RSP_RES] =
mac->cfg.gParamList[WNI_CFG_GET_RSP_RES] =
WNI_CFG_NOT_READY;
pMac->cfg.gParamList[WNI_CFG_GET_RSP_PID] = cfgId;
pMac->cfg.gParamList[WNI_CFG_GET_RSP_PLEN] = 0;
cfg_send_host_msg(pMac, WNI_CFG_GET_RSP,
mac->cfg.gParamList[WNI_CFG_GET_RSP_PID] = cfgId;
mac->cfg.gParamList[WNI_CFG_GET_RSP_PLEN] = 0;
cfg_send_host_msg(mac, WNI_CFG_GET_RSP,
WNI_CFG_GET_RSP_PARTIAL_LEN, WNI_CFG_GET_RSP_NUM,
pMac->cfg.gParamList, 0, 0);
mac->cfg.gParamList, 0, 0);
} else {
/* Process all parameter ID's on the list */
while (length >= sizeof(uint32_t)) {
@@ -529,13 +529,13 @@ static void proc_get_req(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam)
pe_debug("Cfg get param %d", cfgId);
/* Check for valid parameter ID, etc... */
if (check_param
(pMac, cfgId, CFG_CTL_RE, WNI_CFG_WO_PARAM,
(mac, cfgId, CFG_CTL_RE, WNI_CFG_WO_PARAM,
&result)) {
if ((pMac->cfg.gCfgEntry[cfgId].
if ((mac->cfg.gCfgEntry[cfgId].
control & CFG_CTL_INT) != 0) {
/* Get integer parameter */
result =
(wlan_cfg_get_int(pMac, cfgId, &value)
(wlan_cfg_get_int(mac, cfgId, &value)
==
QDF_STATUS_SUCCESS ? WNI_CFG_SUCCESS :
WNI_CFG_OTHER_ERROR);
@@ -543,15 +543,15 @@ static void proc_get_req(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam)
valueLen = sizeof(uint32_t);
} else {
/* Get string parameter */
valueLen = sizeof(pMac->cfg.gSBuffer);
valueLen = sizeof(mac->cfg.gSBuffer);
result =
(wlan_cfg_get_str
(pMac, cfgId, pMac->cfg.gSBuffer,
(mac, cfgId, mac->cfg.gSBuffer,
&valueLen)
== QDF_STATUS_SUCCESS ? WNI_CFG_SUCCESS :
WNI_CFG_OTHER_ERROR);
pValue =
(uint32_t *) pMac->cfg.gSBuffer;
(uint32_t *) mac->cfg.gSBuffer;
}
} else {
pe_warn("Check param failed, param %d",
@@ -560,16 +560,16 @@ static void proc_get_req(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam)
}
/* Send response message to host */
pMac->cfg.gParamList[WNI_CFG_GET_RSP_RES] = result;
pMac->cfg.gParamList[WNI_CFG_GET_RSP_PID] = cfgId;
pMac->cfg.gParamList[WNI_CFG_GET_RSP_PLEN] = valueLen;
mac->cfg.gParamList[WNI_CFG_GET_RSP_RES] = result;
mac->cfg.gParamList[WNI_CFG_GET_RSP_PID] = cfgId;
mac->cfg.gParamList[WNI_CFG_GET_RSP_PLEN] = valueLen;
/* We need to round up buffer length to word-increment */
valueLen = (((valueLen + 3) >> 2) << 2);
cfg_send_host_msg(pMac, WNI_CFG_GET_RSP,
cfg_send_host_msg(mac, WNI_CFG_GET_RSP,
WNI_CFG_GET_RSP_PARTIAL_LEN + valueLen,
WNI_CFG_GET_RSP_NUM,
pMac->cfg.gParamList, valueLen, pValue);
mac->cfg.gParamList, valueLen, pValue);
/* Decrement length */
length -= sizeof(uint32_t);
@@ -604,7 +604,7 @@ static void proc_get_req(tpAniSirGlobal pMac, uint16_t length, uint32_t *pParam)
*
*/
static uint8_t
check_param(tpAniSirGlobal pMac, uint16_t cfgId, uint32_t flag,
check_param(tpAniSirGlobal mac, uint16_t cfgId, uint32_t flag,
uint32_t failedResult, uint32_t *pResult)
{
/* Check if parameter ID is out of bound */
@@ -613,15 +613,15 @@ check_param(tpAniSirGlobal pMac, uint16_t cfgId, uint32_t flag,
*pResult = WNI_CFG_INVALID_PID;
} else {
/* Check if parameter is valid */
if ((pMac->cfg.gCfgEntry[cfgId].control & CFG_CTL_VALID) == 0) {
if ((mac->cfg.gCfgEntry[cfgId].control & CFG_CTL_VALID) == 0) {
pe_warn("Param id: %d not valid", cfgId);
*pResult = WNI_CFG_INVALID_PID;
} else {
/* Check control field against flag */
if ((pMac->cfg.gCfgEntry[cfgId].control & flag) == 0) {
if ((mac->cfg.gCfgEntry[cfgId].control & flag) == 0) {
pe_debug("Param id: %d wrong permissions: %x",
cfgId,
pMac->cfg.gCfgEntry[cfgId].control);
mac->cfg.gCfgEntry[cfgId].control);
*pResult = failedResult;
} else
return true;
@@ -644,14 +644,14 @@ check_param(tpAniSirGlobal pMac, uint16_t cfgId, uint32_t flag,
*
* NOTE:
*
* @param pMac: Pointer to Mac Structure
* @param mac: Pointer to Mac Structure
*
* @return None
*
*/
void
process_cfg_download_req(tpAniSirGlobal pMac)
process_cfg_download_req(tpAniSirGlobal mac)
{
int32_t i;
uint32_t index;
@@ -682,46 +682,46 @@ process_cfg_download_req(tpAniSirGlobal pMac)
} else {
index = 0;
}
pMac->cfg.gCfgEntry[i].control = cfg_static[i].control | index;
mac->cfg.gCfgEntry[i].control = cfg_static[i].control | index;
}
/*Fill the SBUF wih maxLength*/
bufEnd = pMac->cfg.gCfgMaxSBufSize;
bufEnd = mac->cfg.gCfgMaxSBufSize;
for (i = CFG_PARAM_MAX_NUM - 1; i >= 0; i--) {
if ((pMac->cfg.gCfgEntry[i].control & CFG_CTL_INT) != 0)
if ((mac->cfg.gCfgEntry[i].control & CFG_CTL_INT) != 0)
continue;
if ((pMac->cfg.gCfgEntry[i].control & CFG_CTL_VALID) == 0)
if ((mac->cfg.gCfgEntry[i].control & CFG_CTL_VALID) == 0)
continue;
bufStart = pMac->cfg.gCfgEntry[i].control & CFG_BUF_INDX_MASK;
pMac->cfg.gCfgSBuf[bufStart] = (uint8_t)(bufEnd - bufStart - 2);
bufStart = mac->cfg.gCfgEntry[i].control & CFG_BUF_INDX_MASK;
mac->cfg.gCfgSBuf[bufStart] = (uint8_t)(bufEnd - bufStart - 2);
pe_debug("id: %d max: %d bufStart: %d bufEnd: %d",
i, pMac->cfg.gCfgSBuf[bufStart],
i, mac->cfg.gCfgSBuf[bufStart],
bufStart, bufEnd);
bufEnd = bufStart;
}
for (i = 0; i < CFG_PARAM_MAX_NUM ; i++) {
index = pMac->cfg.gCfgEntry[i].control & CFG_BUF_INDX_MASK;
index = mac->cfg.gCfgEntry[i].control & CFG_BUF_INDX_MASK;
if ((pMac->cfg.gCfgEntry[i].control & CFG_CTL_INT) != 0) {
pMac->cfg.gCfgIBufMin[index] = cfg_static[i].cfgIMin;
pMac->cfg.gCfgIBufMax[index] = cfg_static[i].cfgIMax;
pMac->cfg.gCfgIBuf[index] = cfg_static[i].cfgIVal;
if ((mac->cfg.gCfgEntry[i].control & CFG_CTL_INT) != 0) {
mac->cfg.gCfgIBufMin[index] = cfg_static[i].cfgIMin;
mac->cfg.gCfgIBufMax[index] = cfg_static[i].cfgIMax;
mac->cfg.gCfgIBuf[index] = cfg_static[i].cfgIVal;
} else {
uint8_t maxSavedLen;
if ((pMac->cfg.gCfgEntry[i].control & CFG_CTL_VALID) == 0)
if ((mac->cfg.gCfgEntry[i].control & CFG_CTL_VALID) == 0)
continue;
if (index >= pMac->cfg.gCfgMaxSBufSize) {
if (index >= mac->cfg.gCfgMaxSBufSize) {
pe_debug("No space id:%d BufSize:%d index:%d",
i, pMac->cfg.gCfgMaxSBufSize, index);
i, mac->cfg.gCfgMaxSBufSize, index);
continue;
}
pDstTest = &pMac->cfg.gCfgSBuf[index];
pDstTest = &mac->cfg.gCfgSBuf[index];
pStrCfg = (cfgstatic_string*)cfg_static[i].pStrData;
pSrcTest = pStrCfg->data;
if ((pDstTest == NULL) || (pStrCfg == NULL) ||
@@ -741,10 +741,10 @@ process_cfg_download_req(tpAniSirGlobal pMac)
}
/* Set status to READY */
pMac->cfg.gCfgStatus = CFG_SUCCESS;
mac->cfg.gCfgStatus = CFG_SUCCESS;
retVal = WNI_CFG_SUCCESS;
pe_debug("<CFG> Completed successfully");
pMac->cfg.gParamList[WNI_CFG_DNLD_CNF_RES] = retVal;
mac->cfg.gParamList[WNI_CFG_DNLD_CNF_RES] = retVal;
} /*** end ProcessDownloadReq() ***/

6
core/mac/src/cfg/cfg_send_msg.c
View File

@@ -60,7 +60,7 @@
*
*/
void
cfg_send_host_msg(tpAniSirGlobal pMac, uint16_t msgType, uint32_t msgLen,
cfg_send_host_msg(tpAniSirGlobal mac, uint16_t msgType, uint32_t msgLen,
uint32_t paramNum, uint32_t *pParamList, uint32_t dataLen,
uint32_t *pData)
{
@@ -116,7 +116,7 @@ cfg_send_host_msg(tpAniSirGlobal pMac, uint16_t msgType, uint32_t msgLen,
}
/* Ship it */
MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, mmhMsg.type));
sys_process_mmh_msg(pMac, &mmhMsg);
MTRACE(mac_trace_msg_tx(mac, NO_SESSION, mmhMsg.type));
sys_process_mmh_msg(mac, &mmhMsg);
} /*** end cfg_send_host_msg() ***/

10
core/mac/src/include/cfg_api.h
View File

@@ -58,8 +58,8 @@ typedef struct {
/* CFG function prototypes */
/*---------------------------------------------------------------------*/
uint32_t cfg_need_restart(tpAniSirGlobal pMac, uint16_t cfgId);
uint32_t cfg_need_reload(tpAniSirGlobal pMac, uint16_t cfgId);
uint32_t cfg_need_restart(tpAniSirGlobal mac, uint16_t cfgId);
uint32_t cfg_need_reload(tpAniSirGlobal mac, uint16_t cfgId);
/* / Process host message */
void cfg_process_mb_msg(tpAniSirGlobal, tSirMbMsg *);
@@ -92,18 +92,18 @@ QDF_STATUS wlan_cfg_get_str_max_len(tpAniSirGlobal, uint16_t, uint32_t *);
QDF_STATUS wlan_cfg_get_str_len(tpAniSirGlobal, uint16_t, uint32_t *);
/* / Get the regulatory tx power on given channel */
int8_t cfg_get_regulatory_max_transmit_power(tpAniSirGlobal pMac,
int8_t cfg_get_regulatory_max_transmit_power(tpAniSirGlobal mac,
uint8_t channel);
/* / Get capability info */
QDF_STATUS cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap,
QDF_STATUS cfg_get_capability_info(tpAniSirGlobal mac, uint16_t *pCap,
struct pe_session *psessionEntry);
/* / Set capability info */
void cfg_set_capability_info(tpAniSirGlobal, uint16_t);
/* / Cleanup CFG module */
void cfg_cleanup(tpAniSirGlobal pMac);
void cfg_cleanup(tpAniSirGlobal mac);
const char *cfg_get_string(uint16_t cfg_id);