qcacld-3.0: Rename pMac in SYS

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:
sys_entry_func.c
sys_wrapper.c
sys_wrapper.h
utils_parser.c
wlan_qct_sys.c

Change-Id: Ib07f50ea0aa67eef7b04470054014146bf1ca3fc
CRs-Fixed: 2355453
This commit is contained in:
Jeff Johnson 2018-11-22 14:44:24 -08:00 committed by nshrivas
parent 72021f787a
commit 462e304582
5 changed files with 44 additions and 44 deletions

View File

@ -205,14 +205,14 @@ QDF_STATUS sys_mc_process_handler(struct scheduler_msg *msg)
/**
* sys_process_mmh_msg() - this api to process mmh message
* @pMac: pointer to mac context
* @mac: pointer to mac context
* @pMsg: pointer to message
*
* This API is used to process mmh message
*
* Return: none
*/
void sys_process_mmh_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg)
void sys_process_mmh_msg(tpAniSirGlobal mac, struct scheduler_msg *pMsg)
{
QDF_MODULE_ID targetMQ = QDF_MODULE_ID_SYS;

View File

@ -106,11 +106,11 @@ typedef struct TX_TIMER_STRUCT {
/* Pointer to the MAC global structure, which stores the context for the NIC, */
/* for which this timer is supposed to operate. */
void *pMac;
void *mac;
} TX_TIMER;
#define TX_TIMER_VALID(timer) (timer.pMac != 0)
#define TX_TIMER_VALID(timer) (timer.mac != 0)
extern uint64_t tx_time_get(void);
extern uint32_t tx_timer_activate(TX_TIMER *);

View File

@ -249,7 +249,7 @@ static void tx_main_timer_func(void *functionContext)
/* Now call the actual timer function, taking the function pointer, */
/* from the timer structure. */
(*timer_ptr->pExpireFunc)(timer_ptr->pMac, timer_ptr->expireInput);
(*timer_ptr->pExpireFunc)(timer_ptr->mac, timer_ptr->expireInput);
/* check if this needs to be rescheduled */
if (0 != timer_ptr->rescheduleTimeInMsecs) {
@ -307,7 +307,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal,
TX_MSECS_IN_1_TICK * initScheduleTimeInTicks;
timer_ptr->rescheduleTimeInMsecs =
TX_MSECS_IN_1_TICK * rescheduleTimeInTicks;
timer_ptr->pMac = pMacGlobal;
timer_ptr->mac = pMacGlobal;
/* Set the flag indicating that the timer was created */
timer_ptr->tmrSignature = TX_AIRGO_TMR_SIGNATURE;
@ -367,7 +367,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr,
TX_MSECS_IN_1_TICK * initScheduleTimeInTicks;
timer_ptr->rescheduleTimeInMsecs =
TX_MSECS_IN_1_TICK * rescheduleTimeInTicks;
timer_ptr->pMac = pMacGlobal;
timer_ptr->mac = pMacGlobal;
/* Set the flag indicating that the timer was created */
timer_ptr->tmrSignature = TX_AIRGO_TMR_SIGNATURE;

View File

@ -62,12 +62,12 @@
* @return None
*/
QDF_STATUS sys_init_globals(tpAniSirGlobal pMac)
QDF_STATUS sys_init_globals(tpAniSirGlobal mac)
{
qdf_mem_set((uint8_t *) &pMac->sys, sizeof(pMac->sys), 0);
qdf_mem_set((uint8_t *) &mac->sys, sizeof(mac->sys), 0);
pMac->sys.gSysEnableLinkMonitorMode = 0;
mac->sys.gSysEnableLinkMonitorMode = 0;
return QDF_STATUS_SUCCESS;
}

View File

@ -32,27 +32,27 @@
#include "utils_parser.h"
#include "lim_ser_des_utils.h"
void convert_ssid(tpAniSirGlobal pMac, tSirMacSSid *pOld, tDot11fIESSID *pNew)
void convert_ssid(tpAniSirGlobal mac, tSirMacSSid *pOld, tDot11fIESSID *pNew)
{
pOld->length = pNew->num_ssid;
qdf_mem_copy(pOld->ssId, pNew->ssid, pNew->num_ssid);
}
void convert_supp_rates(tpAniSirGlobal pMac,
void convert_supp_rates(tpAniSirGlobal mac,
tSirMacRateSet *pOld, tDot11fIESuppRates *pNew)
{
pOld->numRates = pNew->num_rates;
qdf_mem_copy(pOld->rate, pNew->rates, pNew->num_rates);
}
void convert_ext_supp_rates(tpAniSirGlobal pMac,
void convert_ext_supp_rates(tpAniSirGlobal mac,
tSirMacRateSet *pOld, tDot11fIEExtSuppRates *pNew)
{
pOld->numRates = pNew->num_rates;
qdf_mem_copy(pOld->rate, pNew->rates, pNew->num_rates);
}
void convert_qos_caps(tpAniSirGlobal pMac,
void convert_qos_caps(tpAniSirGlobal mac,
tSirMacQosCapabilityIE *pOld, tDot11fIEQOSCapsAp *pNew)
{
pOld->type = 46;
@ -61,7 +61,7 @@ void convert_qos_caps(tpAniSirGlobal pMac,
pOld->qosInfo.count = pNew->count;
}
void convert_qos_caps_station(tpAniSirGlobal pMac,
void convert_qos_caps_station(tpAniSirGlobal mac,
tSirMacQosCapabilityStaIE *pOld,
tDot11fIEQOSCapsStation *pNew)
{
@ -77,7 +77,7 @@ void convert_qos_caps_station(tpAniSirGlobal pMac,
pOld->qosInfo.acvo_uapsd = pNew->acvo_uapsd;
}
QDF_STATUS convert_wpa(tpAniSirGlobal pMac,
QDF_STATUS convert_wpa(tpAniSirGlobal mac,
tSirMacWpaInfo *pOld, tDot11fIEWPA *pNew)
{
/* This is awful, I know, but the old code just rammed the IE into an */
@ -85,7 +85,7 @@ QDF_STATUS convert_wpa(tpAniSirGlobal pMac,
uint8_t buffer[257];
uint32_t status, written = 0, nbuffer = 257;
status = dot11f_pack_ie_wpa(pMac, pNew, buffer, nbuffer, &written);
status = dot11f_pack_ie_wpa(mac, pNew, buffer, nbuffer, &written);
if (DOT11F_FAILED(status)) {
pe_err("Failed to re-pack the WPA IE (0x%0x8)", status);
return QDF_STATUS_E_FAILURE;
@ -97,7 +97,7 @@ QDF_STATUS convert_wpa(tpAniSirGlobal pMac,
return QDF_STATUS_SUCCESS;
}
QDF_STATUS convert_wpa_opaque(tpAniSirGlobal pMac,
QDF_STATUS convert_wpa_opaque(tpAniSirGlobal mac,
tSirMacWpaInfo *pOld, tDot11fIEWPAOpaque *pNew)
{
/* This is awful, I know, but the old code just rammed the IE into */
@ -113,7 +113,7 @@ QDF_STATUS convert_wpa_opaque(tpAniSirGlobal pMac,
}
#ifdef FEATURE_WLAN_WAPI
QDF_STATUS convert_wapi_opaque(tpAniSirGlobal pMac,
QDF_STATUS convert_wapi_opaque(tpAniSirGlobal mac,
tSirMacWapiInfo *pOld,
tDot11fIEWAPIOpaque *pNew)
{
@ -126,7 +126,7 @@ QDF_STATUS convert_wapi_opaque(tpAniSirGlobal pMac,
}
#endif
QDF_STATUS convert_wsc_opaque(tpAniSirGlobal pMac,
QDF_STATUS convert_wsc_opaque(tpAniSirGlobal mac,
tSirAddie *pOld, tDot11fIEWscIEOpaque *pNew)
{
/* This is awful, I know, but the old code just rammed the IE into */
@ -145,7 +145,7 @@ QDF_STATUS convert_wsc_opaque(tpAniSirGlobal pMac,
return QDF_STATUS_SUCCESS;
}
QDF_STATUS convert_p2p_opaque(tpAniSirGlobal pMac,
QDF_STATUS convert_p2p_opaque(tpAniSirGlobal mac,
tSirAddie *pOld, tDot11fIEP2PIEOpaque *pNew)
{
/* This is awful, I know, but the old code just rammed the IE into */
@ -165,7 +165,7 @@ QDF_STATUS convert_p2p_opaque(tpAniSirGlobal pMac,
}
#ifdef WLAN_FEATURE_WFD
QDF_STATUS convert_wfd_opaque(tpAniSirGlobal pMac,
QDF_STATUS convert_wfd_opaque(tpAniSirGlobal mac,
tSirAddie *pOld, tDot11fIEWFDIEOpaque *pNew)
{
/* This is awful, I know, but the old code just rammed the IE into */
@ -185,13 +185,13 @@ QDF_STATUS convert_wfd_opaque(tpAniSirGlobal pMac,
}
#endif
QDF_STATUS convert_rsn(tpAniSirGlobal pMac,
QDF_STATUS convert_rsn(tpAniSirGlobal mac,
tSirMacRsnInfo *pOld, tDot11fIERSN *pNew)
{
uint8_t buffer[257];
uint32_t status, written = 0, nbuffer = 257;
status = dot11f_pack_ie_rsn(pMac, pNew, buffer, nbuffer, &written);
status = dot11f_pack_ie_rsn(mac, pNew, buffer, nbuffer, &written);
if (DOT11F_FAILED(status)) {
pe_err("Failed to re-pack the RSN IE (0x%0x8)", status);
return QDF_STATUS_E_FAILURE;
@ -203,7 +203,7 @@ QDF_STATUS convert_rsn(tpAniSirGlobal pMac,
return QDF_STATUS_SUCCESS;
}
QDF_STATUS convert_rsn_opaque(tpAniSirGlobal pMac,
QDF_STATUS convert_rsn_opaque(tpAniSirGlobal mac,
tSirMacRsnInfo *pOld, tDot11fIERSNOpaque *pNew)
{
/* This is awful, I know, but the old code just rammed the IE into */
@ -214,7 +214,7 @@ QDF_STATUS convert_rsn_opaque(tpAniSirGlobal pMac,
return QDF_STATUS_SUCCESS;
}
void convert_power_caps(tpAniSirGlobal pMac,
void convert_power_caps(tpAniSirGlobal mac,
tSirMacPowerCapabilityIE *pOld,
tDot11fIEPowerCaps *pNew)
{
@ -224,7 +224,7 @@ void convert_power_caps(tpAniSirGlobal pMac,
pOld->maxTxPower = pNew->maxTxPower;
}
void convert_supp_channels(tpAniSirGlobal pMac,
void convert_supp_channels(tpAniSirGlobal mac,
tSirMacSupportedChannelIE *pOld,
tDot11fIESuppChannels *pNew)
{
@ -234,7 +234,7 @@ void convert_supp_channels(tpAniSirGlobal pMac,
(uint8_t *) pNew->bands, pOld->length);
}
void convert_cf_params(tpAniSirGlobal pMac,
void convert_cf_params(tpAniSirGlobal mac,
tSirMacCfParamSet *pOld, tDot11fIECFParams *pNew)
{
pOld->cfpCount = pNew->cfp_count;
@ -243,7 +243,7 @@ void convert_cf_params(tpAniSirGlobal pMac,
pOld->cfpDurRemaining = pNew->cfp_durremaining;
}
void convert_fh_params(tpAniSirGlobal pMac,
void convert_fh_params(tpAniSirGlobal mac,
tSirMacFHParamSet *pOld, tDot11fIEFHParamSet *pNew)
{
pOld->dwellTime = pNew->dwell_time;
@ -252,7 +252,7 @@ void convert_fh_params(tpAniSirGlobal pMac,
pOld->hopIndex = pNew->hop_index;
}
void convert_tim(tpAniSirGlobal pMac, tSirMacTim *pOld, tDot11fIETIM *pNew)
void convert_tim(tpAniSirGlobal mac, tSirMacTim *pOld, tDot11fIETIM *pNew)
{
pOld->dtimCount = pNew->dtim_count;
pOld->dtimPeriod = pNew->dtim_period;
@ -262,7 +262,7 @@ void convert_tim(tpAniSirGlobal pMac, tSirMacTim *pOld, tDot11fIETIM *pNew)
qdf_mem_copy(pOld->bitmap, pNew->vbmp, pNew->num_vbmp);
}
void convert_country(tpAniSirGlobal pMac,
void convert_country(tpAniSirGlobal mac,
tSirCountryInformation *pOld, tDot11fIECountry *pNew)
{
int i;
@ -280,7 +280,7 @@ void convert_country(tpAniSirGlobal pMac,
}
}
void convert_wmm_params(tpAniSirGlobal pMac,
void convert_wmm_params(tpAniSirGlobal mac,
tSirMacEdcaParamSetIE *pOld, tDot11fIEWMMParams *pNew)
{
pOld->type = 221;
@ -318,7 +318,7 @@ void convert_wmm_params(tpAniSirGlobal pMac,
pOld->acvo.txoplimit = pNew->acvo_txoplimit;
}
void convert_erp_info(tpAniSirGlobal pMac,
void convert_erp_info(tpAniSirGlobal mac,
tSirMacErpInfo *pOld, tDot11fIEERPInfo *pNew)
{
pOld->nonErpPresent = pNew->non_erp_present;
@ -326,7 +326,7 @@ void convert_erp_info(tpAniSirGlobal pMac,
pOld->barkerPreambleMode = pNew->barker_preamble;
}
void convert_edca_param(tpAniSirGlobal pMac,
void convert_edca_param(tpAniSirGlobal mac,
tSirMacEdcaParamSetIE *pOld,
tDot11fIEEDCAParamSet *pNew)
{
@ -401,7 +401,7 @@ void convert_mu_edca_param(tpAniSirGlobal mac_ctx,
}
void convert_tspec(tpAniSirGlobal pMac,
void convert_tspec(tpAniSirGlobal mac,
tSirMacTspecIE *pOld, tDot11fIETSPEC *pNew)
{
pOld->tsinfo.traffic.trafficType = (uint16_t) pNew->traffic_type;
@ -432,12 +432,12 @@ void convert_tspec(tpAniSirGlobal pMac,
pOld->mediumTime = pNew->medium_time;
}
QDF_STATUS convert_tclas(tpAniSirGlobal pMac,
QDF_STATUS convert_tclas(tpAniSirGlobal mac,
tSirTclasInfo *pOld, tDot11fIETCLAS *pNew)
{
uint32_t length = 0;
if (DOT11F_FAILED(dot11f_get_packed_ietclas(pMac, pNew, &length))) {
if (DOT11F_FAILED(dot11f_get_packed_ietclas(mac, pNew, &length))) {
return QDF_STATUS_E_FAILURE;
}
@ -508,7 +508,7 @@ QDF_STATUS convert_tclas(tpAniSirGlobal pMac,
return QDF_STATUS_SUCCESS;
}
void convert_wmmtspec(tpAniSirGlobal pMac,
void convert_wmmtspec(tpAniSirGlobal mac,
tSirMacTspecIE *pOld, tDot11fIEWMMTSPEC *pNew)
{
pOld->tsinfo.traffic.trafficType = (uint16_t) pNew->traffic_type;
@ -536,12 +536,12 @@ void convert_wmmtspec(tpAniSirGlobal pMac,
pOld->mediumTime = pNew->medium_time;
}
QDF_STATUS convert_wmmtclas(tpAniSirGlobal pMac,
QDF_STATUS convert_wmmtclas(tpAniSirGlobal mac,
tSirTclasInfo *pOld, tDot11fIEWMMTCLAS *pNew)
{
uint32_t length = 0;
if (DOT11F_FAILED(dot11f_get_packed_iewmmtclas(pMac, pNew, &length))) {
if (DOT11F_FAILED(dot11f_get_packed_iewmmtclas(mac, pNew, &length))) {
return QDF_STATUS_E_FAILURE;
}
@ -612,7 +612,7 @@ QDF_STATUS convert_wmmtclas(tpAniSirGlobal pMac,
return QDF_STATUS_SUCCESS;
}
void convert_ts_delay(tpAniSirGlobal pMac,
void convert_ts_delay(tpAniSirGlobal mac,
tSirMacTsDelayIE *pOld, tDot11fIETSDelay *pNew)
{
pOld->type = DOT11F_EID_TSDELAY;
@ -620,7 +620,7 @@ void convert_ts_delay(tpAniSirGlobal pMac,
pOld->delay = pNew->delay;
}
void convert_schedule(tpAniSirGlobal pMac,
void convert_schedule(tpAniSirGlobal mac,
tSirMacScheduleIE *pOld, tDot11fIESchedule *pNew)
{
pOld->type = DOT11F_EID_SCHEDULE;
@ -635,7 +635,7 @@ void convert_schedule(tpAniSirGlobal pMac,
pOld->specInterval = pNew->spec_interval;
}
void convert_wmm_schedule(tpAniSirGlobal pMac,
void convert_wmm_schedule(tpAniSirGlobal mac,
tSirMacScheduleIE *pOld, tDot11fIEWMMSchedule *pNew)
{
pOld->type = DOT11F_EID_WMMSCHEDULE;
@ -650,7 +650,7 @@ void convert_wmm_schedule(tpAniSirGlobal pMac,
pOld->specInterval = pNew->spec_interval;
}
void convert_qos_mapset_frame(tpAniSirGlobal pMac, tSirQosMapSet *Qos,
void convert_qos_mapset_frame(tpAniSirGlobal mac, tSirQosMapSet *Qos,
tDot11fIEQosMapSet *dot11fIE)
{
uint8_t i, j = 0;