wlan: Convert PELOG1 to limlog and handle the compilation errors.
Convert useful logs which are PELOG1 to limlog (VOS TRACE) and
also few changes for compilation error.
Change-Id: I6a141deec7dbe364efbe0ef945ea8f9b5c73d4c4
CRs-fixed: 771131
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index fef279b..004cdb9 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -207,7 +207,7 @@
else
checkTraffic = eSIR_CHECK_ROAMING_SCAN;
- PELOG1(limLog(pMac, LOG1, FL("Calling limSendHalInitScanReq"));)
+ limLog(pMac, LOG1, FL("Calling limSendHalInitScanReq"));
limSendHalInitScanReq(pMac, eLIM_HAL_INIT_SCAN_WAIT_STATE, checkTraffic);
return ;
@@ -677,15 +677,15 @@
{
if ((eSIR_PASSIVE_SCAN == channelPair[i+1]) && TRUE == passiveToActive)
{
- PELOG1(limLog(pMac, LOG1, FL("Channel %d changed from Passive to Active"),
- channelNum);)
+ limLog(pMac, LOG1, FL("Channel %d changed from Passive to Active"),
+ channelNum);
channelPair[i+1] = eSIR_ACTIVE_SCAN;
break ;
}
if ((eSIR_ACTIVE_SCAN == channelPair[i+1]) && FALSE == passiveToActive)
{
- PELOG1(limLog(pMac, LOG1, FL("Channel %d changed from Active to Passive"),
- channelNum);)
+ limLog(pMac, LOG1, FL("Channel %d changed from Active to Passive"),
+ channelNum);
channelPair[i+1] = eSIR_PASSIVE_SCAN;
break ;
}
@@ -731,14 +731,14 @@
if (dfsChannelList->timeStamp[channelNum] == 0)
{
//Received first beacon; Convert DFS channel to Active channel.
- PELOG1(limLog(pMac, LOG1, FL("Received first beacon on DFS channel: %d"), channelNum);)
+ limLog(pMac, LOG1, FL("Received first beacon on DFS channel: %d"), channelNum);
limCovertChannelScanType(pMac,channelNum, passiveToActive);
}
dfsChannelList->timeStamp[channelNum] = vos_timer_get_system_time();
}
else
{
- PELOG1(limLog(pMac, LOG1, FL("Channel %d is Active"), channelNum);)
+ limLog(pMac, LOG1, FL("Channel %d is Active"), channelNum);
return;
}
if (!tx_timer_running(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer))
@@ -1250,9 +1250,9 @@
{
tANI_U8 channelNum;
- PELOG1(limLog(pMac, LOG1, FL("Continue SCAN : chan %d tot %d"),
+ limLog(pMac, LOG1, FL("Continue SCAN on chan %d, total chan %d"),
pMac->lim.gLimCurrentScanChannelId,
- pMac->lim.gpLimMlmScanReq->channelList.numChannels);)
+ pMac->lim.gpLimMlmScanReq->channelList.numChannels);
if (pMac->lim.gLimCurrentScanChannelId >
(tANI_U32) (pMac->lim.gpLimMlmScanReq->channelList.numChannels - 1)
@@ -1370,7 +1370,8 @@
//limCleanupMsgQ(pMac);
pMac->lim.gLimSystemInScanLearnMode = 0;
- PELOG1(limLog(pMac, LOG1, FL("Scan ended, took %d tu"), (tx_time_get() - pMac->lim.scanStartTime));)
+ limLog(pMac, LOG1, FL("Scan ended, took %ld tu"),
+ (tx_time_get() - pMac->lim.scanStartTime));
} /*** limRestorePreScanState() ***/
#ifdef FEATURE_OEM_DATA_SUPPORT
@@ -3844,7 +3845,7 @@
if (pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE &&
pMac->lim.gLimHalScanState != eLIM_HAL_FINISH_SCAN_WAIT_STATE)
{
- PELOG1(limLog(pMac, LOG1, FL("Scanning : min channel timeout occurred"));)
+ limLog(pMac, LOG1, FL("Scanning : min channel timeout occurred"));
/// Min channel timer timed out
pMac->lim.limTimers.gLimPeriodicProbeReqTimer.sessionId = 0xff;
@@ -3919,7 +3920,7 @@
pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE) &&
pMac->lim.gLimHalScanState != eLIM_HAL_FINISH_SCAN_WAIT_STATE)
{
- PELOG1(limLog(pMac, LOG1, FL("Scanning : Max channel timed out"));)
+ limLog(pMac, LOG1, FL("Scanning : Max channel timed out"));
/**
* MAX channel timer timed out
* Continue channel scan.
@@ -3993,7 +3994,7 @@
if(vos_timer_getCurrentState(&pPeriodicProbeReqTimer->vosTimer)
!= VOS_TIMER_STATE_STOPPED)
{
- PELOG1(limLog(pMac, LOG1, FL("Invalid state of timer"));)
+ limLog(pMac, LOG1, FL("Invalid state of timer"));
return;
}
@@ -4001,7 +4002,7 @@
(pPeriodicProbeReqTimer->sessionId != 0xff) && (pMac->lim.probeCounter < pMac->lim.maxProbe))
{
tLimMlmScanReq *pLimMlmScanReq = pMac->lim.gpLimMlmScanReq;
- PELOG1(limLog(pMac, LOG1, FL("Scanning : Periodic scanning"));)
+ limLog(pMac, LOG1, FL("Scanning : Periodic scanning"));
pMac->lim.probeCounter++;
/**
* Periodic channel timer timed out
@@ -4366,9 +4367,9 @@
// timedout for an STA.
pAuthNode->mlmState = eLIM_MLM_AUTH_RSP_TIMEOUT_STATE;
pAuthNode->fTimerStarted = 0;
- PELOG1( limLog(pMac, LOG1,
+ limLog(pMac, LOG1,
FL("AUTH rsp timedout for MAC address "MAC_ADDRESS_STR),
- MAC_ADDR_ARRAY(pAuthNode->peerMacAddr));)
+ MAC_ADDR_ARRAY(pAuthNode->peerMacAddr));
// Change timer to reactivate it in future
limDeactivateAndChangePerStaIdTimer(pMac,
@@ -4448,8 +4449,8 @@
WLANTL_AssocFailed (psessionEntry->staId);
// Log error
- PELOG1(limLog(pMac, LOG1,
- FL("Re/Association Response not received before timeout "));)
+ limLog(pMac, LOG1,
+ FL("Re/Association Response not received before timeout "));
if (( (psessionEntry->limSystemRole == eLIM_AP_ROLE) || (psessionEntry->limSystemRole == eLIM_BT_AMP_AP_ROLE) )||
( (psessionEntry->limMlmState != eLIM_MLM_WT_ASSOC_RSP_STATE) &&
@@ -4492,8 +4493,8 @@
//To remove the preauth node in case of fail to associate
if (limSearchPreAuthList(pMac, psessionEntry->bssId))
{
- PELOG1(limLog(pMac, LOG1, FL(" delete pre auth node for "
- MAC_ADDRESS_STR), MAC_ADDR_ARRAY(psessionEntry->bssId));)
+ limLog(pMac, LOG1, FL(" delete pre auth node for "
+ MAC_ADDRESS_STR), MAC_ADDR_ARRAY(psessionEntry->bssId));
limDeletePreAuthNode(pMac, psessionEntry->bssId);
}