wlan : To remove PAL timer wrapper in SME
This is to remove PAL timer calls and replace with vos timer calls
CRs-Fixed: 520322
Change-Id: I2434be1d3e2b3a8d60b66566cc956f8a77501f3a
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 4962386..b2844e3 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -690,13 +690,13 @@
tDblLinkList tempScanResults;
tANI_BOOLEAN fScanEnable;
tANI_BOOLEAN fFullScanIssued;
- tPalTimerHandle hTimerGetResult;
+ vos_timer_t hTimerGetResult;
#ifdef WLAN_AP_STA_CONCURRENCY
- tPalTimerHandle hTimerStaApConcTimer;
+ vos_timer_t hTimerStaApConcTimer;
#endif
- tPalTimerHandle hTimerIdleScan;
- tPalTimerHandle hTimerResultAging;
- tPalTimerHandle hTimerResultCfgAging;
+ vos_timer_t hTimerIdleScan;
+ vos_timer_t hTimerResultAging;
+ vos_timer_t hTimerResultCfgAging;
tPalTimerHandle hTimerBgScan;
//changes on every scan, it is used as a flag for whether 11d info is found on every scan
tANI_U8 channelOf11dInfo;
@@ -849,7 +849,7 @@
{
tANI_U32 periodicity;
tANI_BOOLEAN timerRunning;
- tPalTimerHandle hTlStatsTimer;
+ vos_timer_t hTlStatsTimer;
tANI_U8 numClient;
}tCsrTlStatsReqInfo;
@@ -899,8 +899,8 @@
tCsrTimerInfo roamingTimerInfo;
eCsrRoamingReason roamingReason;
tANI_BOOLEAN fCancelRoaming;
- tPalTimerHandle hTimerRoaming;
- tPalTimerHandle hTimerIbssJoining;
+ vos_timer_t hTimerRoaming;
+ vos_timer_t hTimerIbssJoining;
tCsrTimerInfo ibssJoinTimerInfo;
tANI_BOOLEAN ibss_join_pending;
eCsrRoamResult roamResult; //the roamResult that is used when the roaming timer fires
@@ -916,7 +916,7 @@
tANI_BOOLEAN fWMMConnection;
#ifdef FEATURE_WLAN_BTAMP_UT_RF
//To retry a join later when it fails if so desired
- tPalTimerHandle hTimerJoinRetry;
+ vos_timer_t hTimerJoinRetry;
tCsrTimerInfo joinRetryTimerInfo;
tANI_U32 maxRetryCount;
#endif
@@ -954,7 +954,7 @@
tANI_U32 numValidChannels; //total number of channels in CFG
tANI_S32 sPendingCommands;
- tPalTimerHandle hTimerWaitForKey; //To support timeout for WaitForKey state
+ vos_timer_t hTimerWaitForKey; //To support timeout for WaitForKey state
tCsrSummaryStatsInfo summaryStatsInfo;
tCsrGlobalClassAStatsInfo classAStatsInfo;
tCsrGlobalClassBStatsInfo classBStatsInfo;
diff --git a/CORE/SME/inc/csrNeighborRoam.h b/CORE/SME/inc/csrNeighborRoam.h
index e196de0..fdc1aed 100644
--- a/CORE/SME/inc/csrNeighborRoam.h
+++ b/CORE/SME/inc/csrNeighborRoam.h
@@ -182,9 +182,9 @@
tCsrNeighborRoamCfgParams cfgParams;
tCsrBssid currAPbssid; // current assoc AP
tANI_U8 currAPoperationChannel; // current assoc AP
- tPalTimerHandle neighborScanTimer;
- tPalTimerHandle neighborResultsRefreshTimer;
- tPalTimerHandle emptyScanRefreshTimer;
+ vos_timer_t neighborScanTimer;
+ vos_timer_t neighborResultsRefreshTimer;
+ vos_timer_t emptyScanRefreshTimer;
tCsrTimerInfo neighborScanTimerInfo;
tCsrNeighborRoamChannelInfo roamChannelInfo;
tANI_U8 currentNeighborLookupThreshold;
diff --git a/CORE/SME/inc/p2p_Api.h b/CORE/SME/inc/p2p_Api.h
index a751f54..a810d84 100644
--- a/CORE/SME/inc/p2p_Api.h
+++ b/CORE/SME/inc/p2p_Api.h
@@ -432,14 +432,14 @@
tANI_U32 ActionFrameLen;
tANI_U32 ActionFrameSendTimeout;
eListenDiscoverableState listenDiscoverableState;
- tPalTimerHandle listenTimerHandler;
- tPalTimerHandle WPSRegistrarCheckTimerHandler;
+ vos_timer_t listenTimerHandler;
+ vos_timer_t WPSRegistrarCheckTimerHandler;
tANI_U32 WPSRegistrarSet;
tANI_U8 bWaitForWPSReady;
tANI_U8 bInGroupFormation;
- tPalTimerHandle discoverTimer;
- tPalTimerHandle retryActionFrameTimer;
- tPalTimerHandle actionFrameTimer;
+ vos_timer_t discoverTimer;
+ vos_timer_t retryActionFrameTimer;
+ vos_timer_t actionFrameTimer;
tPalTimerHandle nextActionFrameTimer;
tANI_U8 peerMacAddress[P2P_MAC_ADDRESS_LEN];
tANI_U8 selfMacAddress[P2P_MAC_ADDRESS_LEN];
diff --git a/CORE/SME/inc/pmc.h b/CORE/SME/inc/pmc.h
index 78d9316..3a82cbb 100644
--- a/CORE/SME/inc/pmc.h
+++ b/CORE/SME/inc/pmc.h
@@ -168,12 +168,12 @@
void (*impsCallbackRoutine) (void *callbackContext, eHalStatus status); /* routine to call when IMPS period
has finished */
void *impsCallbackContext; /* value to be passed as parameter to routine specified above */
- tPalTimerHandle hImpsTimer; /* timer to use with IMPS */
+ vos_timer_t hImpsTimer; /* timer to use with IMPS */
vos_timer_t hTrafficTimer; /* timer to measure traffic for BMPS */
#ifdef FEATURE_WLAN_DIAG_SUPPORT
- tPalTimerHandle hDiagEvtTimer; /* timer to report PMC state through DIAG event */
+ vos_timer_t hDiagEvtTimer; /* timer to report PMC state through DIAG event */
#endif
- tPalTimerHandle hExitPowerSaveTimer; /* timer for deferred exiting of power save mode */
+ vos_timer_t hExitPowerSaveTimer; /* timer for deferred exiting of power save mode */
tDblLinkList powerSaveCheckList; /* power save check routine list */
tDblLinkList requestFullPowerList; /* request full power callback routine list */
tANI_U32 cLastTxUnicastFrames; /* transmit unicast frame count at last BMPS traffic timer expiration */
diff --git a/CORE/SME/inc/sme_FTApi.h b/CORE/SME/inc/sme_FTApi.h
index 1dba737..2689c9e 100644
--- a/CORE/SME/inc/sme_FTApi.h
+++ b/CORE/SME/inc/sme_FTApi.h
@@ -88,7 +88,7 @@
v_BOOL_t setFTPTKState;
// Time to trigger reassoc once pre-auth is successful
- tPalTimerHandle preAuthReassocIntvlTimer;
+ vos_timer_t preAuthReassocIntvlTimer;
tCsrRoamSetKey *pCsrFTKeyInfo;
} tftSMEContext, *tpftSMEContext;
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index f8e7869..028e36d 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -564,7 +564,7 @@
for( i = 0; i < CSR_ROAM_SESSION_MAX; i++ )
{
- csrRoamStateChange( pMac, eCSR_ROAMING_STATE_STOP ,i );
+ csrRoamStateChange( pMac, eCSR_ROAMING_STATE_STOP, i );
pMac->roam.curSubState[i] = eCSR_ROAM_SUBSTATE_NONE;
}
@@ -637,15 +637,17 @@
}
pMac->roam.WaitForKeyTimerInfo.pMac = pMac;
pMac->roam.WaitForKeyTimerInfo.sessionId = CSR_SESSION_ID_INVALID;
- status = palTimerAlloc(pMac->hHdd, &pMac->roam.hTimerWaitForKey, csrRoamWaitForKeyTimeOutHandler,
+ status = vos_timer_init(&pMac->roam.hTimerWaitForKey, VOS_TIMER_TYPE_SW,
+ csrRoamWaitForKeyTimeOutHandler,
&pMac->roam.WaitForKeyTimerInfo);
- if(!HAL_STATUS_SUCCESS(status))
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for WaitForKey time out timer"));
break;
}
- status = palTimerAlloc(pMac->hHdd, &pMac->roam.tlStatsReqInfo.hTlStatsTimer, csrRoamTlStatsTimerHandler, pMac);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pMac->roam.tlStatsReqInfo.hTlStatsTimer,
+ VOS_TIMER_TYPE_SW, csrRoamTlStatsTimerHandler, pMac);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for summary Statistics timer"));
return eHAL_STATUS_FAILURE;
@@ -661,10 +663,10 @@
{
csrRoamCloseSession(pMac, sessionId, TRUE, NULL, NULL);
}
- palTimerStop(pMac->hHdd, pMac->roam.hTimerWaitForKey);
- palTimerFree(pMac->hHdd, pMac->roam.hTimerWaitForKey);
- palTimerStop(pMac->hHdd, pMac->roam.tlStatsReqInfo.hTlStatsTimer);
- palTimerFree(pMac->hHdd, pMac->roam.tlStatsReqInfo.hTlStatsTimer);
+ vos_timer_stop(&pMac->roam.hTimerWaitForKey);
+ vos_timer_destroy(&pMac->roam.hTimerWaitForKey);
+ vos_timer_stop(&pMac->roam.tlStatsReqInfo.hTlStatsTimer);
+ vos_timer_destroy(&pMac->roam.tlStatsReqInfo.hTlStatsTimer);
return (eHAL_STATUS_SUCCESS);
}
@@ -2410,10 +2412,10 @@
pRoamInfo->sessionId = (tANI_U8)sessionId;
}
- /* avoid holding the global lock when making the roaming callback , original change came
- from a raised CR (CR304874). Since this callback is in HDD a potential deadlock
- is possible on other OS ports where the callback may need to take locks to protect
- HDD state
+ /* avoid holding the global lock when making the roaming callback, original change came
+ from a raised CR (CR304874). Since this callback is in HDD a potential deadlock
+ is possible on other OS ports where the callback may need to take locks to protect
+ HDD state
UPDATE : revert this change but keep the comments here. Need to revisit as there are callbacks
that may actually depend on the lock being held */
// TODO: revisit: sme_ReleaseGlobalLock( &pMac->sme );
@@ -2659,7 +2661,7 @@
}
smsLog( pMac, LOG2, "CSR issuing tkip counter measures for Bssid = %02x-%02x-%02x-%02x-%02x-%02x, Enable = %d",
bssId[ 0 ], bssId[ 1 ], bssId[ 2 ],
- bssId[ 3 ], bssId[ 4 ], bssId[ 5 ] , bEnable);
+ bssId[ 3 ], bssId[ 4 ], bssId[ 5 ], bEnable);
status = csrSendMBTkipCounterMeasuresReqMsg( pMac, sessionId, bEnable, bssId );
return (status);
}
@@ -6152,7 +6154,7 @@
eHalStatus csrRoamEnqueuePreauth(tpAniSirGlobal pMac, tANI_U32 sessionId, tpSirBssDescription pBssDescription,
eCsrRoamReason reason, tANI_BOOLEAN fImmediate)
-// , eCsrRoamReason reason, tANI_U32 roamId, tANI_BOOLEAN fImediate)
+// , eCsrRoamReason reason, tANI_U32 roamId, tANI_BOOLEAN fImediate)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tSmeCmd *pCommand;
@@ -9814,14 +9816,14 @@
smsLog(pMac, LOG1, " csrScanStartRoamingTimer");
pSession->roamingTimerInfo.sessionId = (tANI_U8)sessionId;
- status = palTimerStart(pMac->hHdd, pSession->hTimerRoaming, interval, eANI_BOOLEAN_FALSE);
+ status = vos_timer_start(&pSession->hTimerRoaming, interval/PAL_TIMER_TO_MS_UNIT);
return (status);
}
eHalStatus csrRoamStopRoamingTimer(tpAniSirGlobal pMac, tANI_U32 sessionId)
{
- return (palTimerStop(pMac->hHdd, pMac->roam.roamSession[sessionId].hTimerRoaming));
+ return (vos_timer_stop(&pMac->roam.roamSession[sessionId].hTimerRoaming));
}
void csrRoamWaitForKeyTimeOutHandler(void *pv)
@@ -9890,7 +9892,7 @@
}
#endif
smsLog(pMac, LOG1, " csrScanStartWaitForKeyTimer");
- status = palTimerStart(pMac->hHdd, pMac->roam.hTimerWaitForKey, interval, eANI_BOOLEAN_FALSE);
+ status = vos_timer_start(&pMac->roam.hTimerWaitForKey, interval/PAL_TIMER_TO_MS_UNIT);
return (status);
}
@@ -9915,7 +9917,7 @@
NULL, eANI_BOOLEAN_FALSE);
}
#endif
- return (palTimerStop(pMac->hHdd, pMac->roam.hTimerWaitForKey));
+ return (vos_timer_stop(&pMac->roam.hTimerWaitForKey));
}
void csrRoamIbssJoinTimerHandler(void *pv)
@@ -9951,13 +9953,13 @@
smsLog(pMac, LOG1, " csrRoamStartIbssJoinTimer");
pSession->ibssJoinTimerInfo.sessionId = (tANI_U8)sessionId;
- status = palTimerStart(pMac->hHdd, pSession->hTimerIbssJoining, interval, eANI_BOOLEAN_FALSE);
+ status = vos_timer_start(&pSession->hTimerIbssJoining, interval/PAL_TIMER_TO_MS_UNIT);
return (status);
}
eHalStatus csrRoamStopIbssJoinTimer(tpAniSirGlobal pMac, tANI_U32 sessionId)
{
- return (palTimerStop(pMac->hHdd, pMac->roam.roamSession[sessionId].hTimerIbssJoining));
+ return (vos_timer_stop(&pMac->roam.roamSession[sessionId].hTimerIbssJoining));
}
void csrRoamCompletion(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamInfo *pRoamInfo, tSmeCmd *pCommand,
eCsrRoamResult roamResult, tANI_BOOLEAN fSuccess)
@@ -12851,7 +12853,7 @@
// alternateChannelId
*pBuf = 11;
pBuf += sizeof (tANI_U8);
- // Instead of copying roam Info, we just copy only WmmEnabled , RsnIE information
+ // Instead of copying roam Info, we just copy only WmmEnabled, RsnIE information
//Wmm
*pBuf = pAssocInd->wmmEnabledSta;
pBuf += sizeof (tANI_U8);
@@ -12872,7 +12874,7 @@
return( status );
}
-eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId ,
+eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId,
tSirMacAddr peerMacAddr, tANI_U8 numKeys, tAniEdType edType,
tANI_BOOLEAN fUnicast, tAniKeyDirection aniKeyDirection,
tANI_U8 keyId, tANI_U8 keyLength, tANI_U8 *pKey, tANI_U8 paeRole,
@@ -13388,17 +13390,19 @@
pSession->pContext = pContext;
palCopyMemory( pMac->hHdd, &pSession->selfMacAddr, pSelfMacAddr, sizeof(tCsrBssid) );
*pbSessionId = (tANI_U8)i;
- status = palTimerAlloc(pMac->hHdd, &pSession->hTimerRoaming, csrRoamRoamingTimerHandler,
+ status = vos_timer_init(&pSession->hTimerRoaming, VOS_TIMER_TYPE_SW,
+ csrRoamRoamingTimerHandler,
&pSession->roamingTimerInfo);
- if(!HAL_STATUS_SUCCESS(status))
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for Roaming timer"));
break;
}
#ifdef FEATURE_WLAN_BTAMP_UT_RF
- status = palTimerAlloc(pMac->hHdd, &pSession->hTimerJoinRetry, csrRoamJoinRetryTimerHandler,
+ status = vos_timer_init(&pSession->hTimerJoinRetry, VOS_TIMER_TYPE_SW,
+ csrRoamJoinRetryTimerHandler,
&pSession->joinRetryTimerInfo);
- if(!HAL_STATUS_SUCCESS(status))
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for joinretry timer"));
break;
@@ -13406,9 +13410,10 @@
#endif
pSession->ibssJoinTimerInfo.pMac = pMac;
pSession->ibssJoinTimerInfo.sessionId = CSR_SESSION_ID_INVALID;
- status = palTimerAlloc(pMac->hHdd, &pSession->hTimerIbssJoining, csrRoamIbssJoinTimerHandler,
+ status = vos_timer_init(&pSession->hTimerIbssJoining, VOS_TIMER_TYPE_SW,
+ csrRoamIbssJoinTimerHandler,
&pSession->ibssJoinTimerInfo);
- if(!HAL_STATUS_SUCCESS(status))
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for IbssJoining timer"));
break;
@@ -13595,11 +13600,11 @@
csrFreeConnectBssDesc(pMac, sessionId);
csrRoamFreeConnectProfile( pMac, &pSession->connectedProfile );
csrRoamFreeConnectedInfo ( pMac, &pSession->connectedInfo);
- palTimerFree(pMac->hHdd, pSession->hTimerRoaming);
+ vos_timer_destroy(&pSession->hTimerRoaming);
#ifdef FEATURE_WLAN_BTAMP_UT_RF
- palTimerFree(pMac->hHdd, pSession->hTimerJoinRetry);
+ vos_timer_destroy(&pSession->hTimerJoinRetry);
#endif
- palTimerFree(pMac->hHdd, pSession->hTimerIbssJoining);
+ vos_timer_destroy(&pSession->hTimerIbssJoining);
purgeSmeSessionCmdList(pMac, sessionId);
purgeCsrSessionCmdList(pMac, sessionId);
csrInitSession(pMac, sessionId);
@@ -13824,9 +13829,9 @@
if(pMac->roam.tlStatsReqInfo.periodicity)
{
//start timer
- status = palTimerStart(pMac->hHdd, pMac->roam.tlStatsReqInfo.hTlStatsTimer,
- pMac->roam.tlStatsReqInfo.periodicity * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_start(&pMac->roam.tlStatsReqInfo.hTlStatsTimer,
+ pMac->roam.tlStatsReqInfo.periodicity);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("csrRoamTlStatsTimerHandler:cannot start TlStatsTimer timer"));
return;
@@ -13856,7 +13861,7 @@
}
// Free the entry
- palFreeMemory(pMac->hHdd, pPeStatsReqListEntry);
+ vos_mem_free(pPeStatsReqListEntry);
pPeStatsReqListEntry = NULL;
}
else
@@ -14520,8 +14525,8 @@
{
if(pMac->roam.tlStatsReqInfo.timerRunning)
{
- status = palTimerStop(pMac->hHdd, pMac->roam.tlStatsReqInfo.hTlStatsTimer);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_stop(&pMac->roam.tlStatsReqInfo.hTlStatsTimer);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("csrGetStatistics:cannot stop TlStatsTimer timer"));
return eHAL_STATUS_FAILURE;
@@ -14633,9 +14638,9 @@
if(pMac->roam.tlStatsReqInfo.periodicity)
{
//start timer
- status = palTimerStart(pMac->hHdd, pMac->roam.tlStatsReqInfo.hTlStatsTimer,
- pMac->roam.tlStatsReqInfo.periodicity * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_start(&pMac->roam.tlStatsReqInfo.hTlStatsTimer,
+ pMac->roam.tlStatsReqInfo.periodicity);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("csrGetStatistics:cannot start TlStatsTimer timer"));
return eHAL_STATUS_FAILURE;
@@ -14822,7 +14827,7 @@
nSirStatus = csrRoamScanOffloadPopulateMacHeader( pMac, pFrame, SIR_MAC_MGMT_FRAME,
- SIR_MAC_MGMT_PROBE_REQ, bssId ,selfMacAddr);
+ SIR_MAC_MGMT_PROBE_REQ, bssId,selfMacAddr);
if ( eSIR_SUCCESS != nSirStatus )
{
@@ -15241,7 +15246,7 @@
* the entry from the linked list. Destroy the timer object
* and free the memory in the timer CB
*/
- if( vosStatus == VOS_STATUS_SUCCESS )
+ if ( vosStatus == VOS_STATUS_SUCCESS )
{
/* the timer is successfully stopped */
pTempStaEntry->timerRunning = FALSE;
@@ -15441,8 +15446,8 @@
{
if(pMac->roam.tlStatsReqInfo.timerRunning)
{
- status = palTimerStop(pMac->hHdd, pMac->roam.tlStatsReqInfo.hTlStatsTimer);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_stop(&pMac->roam.tlStatsReqInfo.hTlStatsTimer);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("csrRoamDeregStatisticsReq:cannot stop TlStatsTimer timer"));
//we will continue
@@ -15925,9 +15930,8 @@
}
/* Start the pre-auth reassoc interval timer with a period of 400ms. When this expires,
* actual transition from the current to handoff AP is triggered */
- status = palTimerStart(pMac->hHdd, pMac->ft.ftSmeContext.preAuthReassocIntvlTimer,
- 60 * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE);
+ status = vos_timer_start(&pMac->ft.ftSmeContext.preAuthReassocIntvlTimer,
+ 60);
if (eHAL_STATUS_SUCCESS != status)
{
smsLog(pMac, LOGE, FL("Preauth reassoc interval timer start failed to start with status %d"), status);
@@ -15988,8 +15992,8 @@
pSession->maxRetryCount--;
pSession->joinRetryTimerInfo.pMac = pMac;
pSession->joinRetryTimerInfo.sessionId = (tANI_U8)sessionId;
- status = palTimerStart(pMac->hHdd, pSession->hTimerJoinRetry, interval, eANI_BOOLEAN_FALSE);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_start(&pSession->hTimerJoinRetry, interval/PAL_TIMER_TO_MS_UNIT);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL(" fail to start timer status %s"), status);
}
@@ -16007,7 +16011,7 @@
smsLog(pMac, LOGE, " csrRoamStopJoinRetryTimer");
if( CSR_IS_SESSION_VALID(pMac, sessionId) )
{
- return (palTimerStop(pMac->hHdd, pMac->roam.roamSession[sessionId].hTimerJoinRetry));
+ return (vos_timer_stop(&pMac->roam.roamSession[sessionId].hTimerJoinRetry));
}
return eHAL_STATUS_SUCCESS;
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 24eeef7..2cc3fc8 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -305,35 +305,35 @@
#endif
pMac->scan.fFullScanIssued = eANI_BOOLEAN_FALSE;
pMac->scan.nBssLimit = CSR_MAX_BSS_SUPPORT;
- status = palTimerAlloc(pMac->hHdd, &pMac->scan.hTimerGetResult, csrScanGetResultTimerHandler, pMac);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pMac->scan.hTimerGetResult, VOS_TIMER_TYPE_SW, csrScanGetResultTimerHandler, pMac);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for getResult timer"));
break;
}
#ifdef WLAN_AP_STA_CONCURRENCY
- status = palTimerAlloc(pMac->hHdd, &pMac->scan.hTimerStaApConcTimer, csrStaApConcTimerHandler, pMac);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pMac->scan.hTimerStaApConcTimer, VOS_TIMER_TYPE_SW, csrStaApConcTimerHandler, pMac);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for hTimerStaApConcTimer timer"));
break;
}
#endif
- status = palTimerAlloc(pMac->hHdd, &pMac->scan.hTimerIdleScan, csrScanIdleScanTimerHandler, pMac);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pMac->scan.hTimerIdleScan, VOS_TIMER_TYPE_SW, csrScanIdleScanTimerHandler, pMac);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for idleScan timer"));
break;
}
- status = palTimerAlloc(pMac->hHdd, &pMac->scan.hTimerResultAging, csrScanResultAgingTimerHandler, pMac);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pMac->scan.hTimerResultAging, VOS_TIMER_TYPE_SW, csrScanResultAgingTimerHandler, pMac);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for ResultAging timer"));
break;
}
- status = palTimerAlloc(pMac->hHdd, &pMac->scan.hTimerResultCfgAging,
- csrScanResultCfgAgingTimerHandler, pMac);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pMac->scan.hTimerResultCfgAging, VOS_TIMER_TYPE_SW,
+ csrScanResultCfgAgingTimerHandler, pMac);
+ if (!HAL_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL("cannot allocate memory for CFG ResultAging timer"));
break;
@@ -366,13 +366,13 @@
csrLLClose(&pMac->scan.channelPowerInfoList24);
csrLLClose(&pMac->scan.channelPowerInfoList5G);
csrScanDisable(pMac);
- palTimerFree(pMac->hHdd, pMac->scan.hTimerResultAging);
- palTimerFree(pMac->hHdd, pMac->scan.hTimerResultCfgAging);
- palTimerFree(pMac->hHdd, pMac->scan.hTimerGetResult);
+ vos_timer_destroy(&pMac->scan.hTimerResultAging);
+ vos_timer_destroy(&pMac->scan.hTimerResultCfgAging);
+ vos_timer_destroy(&pMac->scan.hTimerGetResult);
#ifdef WLAN_AP_STA_CONCURRENCY
- palTimerFree(pMac->hHdd, pMac->scan.hTimerStaApConcTimer);
+ vos_timer_destroy(&pMac->scan.hTimerStaApConcTimer);
#endif
- palTimerFree(pMac->hHdd, pMac->scan.hTimerIdleScan);
+ vos_timer_destroy(&pMac->scan.hTimerIdleScan);
return eHAL_STATUS_SUCCESS;
}
@@ -773,7 +773,7 @@
}
#endif
/*For Standalone wlan : channel time will remain the same.
- For BTC with A2DP up: Channel time = Channel time * 2 , if station is not already associated.
+ For BTC with A2DP up: Channel time = Channel time * 2, if station is not already associated.
This has been done to provide a larger scan window for faster connection during btc.Else Scan is seen
to take a long time.
For BTC with A2DP up: Channel time will not be doubled, if station is already associated.
@@ -2576,7 +2576,7 @@
//pIes may be NULL
tANI_BOOLEAN csrRemoveDupBssDescription( tpAniSirGlobal pMac, tSirBssDescription *pSirBssDescr,
- tDot11fBeaconIEs *pIes, tAniSSID *pSsid , v_TIME_t *timer, tANI_BOOLEAN fForced )
+ tDot11fBeaconIEs *pIes, tAniSSID *pSsid, v_TIME_t *timer, tANI_BOOLEAN fForced )
{
tListElem *pEntry;
@@ -2863,7 +2863,7 @@
csrFreeScanResultEntry(pMac, pBssDescription);
continue;
}
- fDupBss = csrRemoveDupBssDescription( pMac, &pBssDescription->Result.BssDescriptor, pIesLocal, &tmpSsid , &timer, FALSE );
+ fDupBss = csrRemoveDupBssDescription( pMac, &pBssDescription->Result.BssDescriptor, pIesLocal, &tmpSsid, &timer, FALSE );
//Check whether we have reach out limit, but don't lose the LFR candidates came from FW
if( CSR_SCAN_IS_OVER_BSS_LIMIT(pMac)
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
@@ -4738,12 +4738,12 @@
/* if active connected sessions present then continue to split scan
* with specified interval between consecutive scans */
csrSetDefaultScanTiming(pMac, pCommand->u.scanCmd.u.scanRequest.scanType, &(pCommand->u.scanCmd.u.scanRequest));
- palTimerStart(pMac->hHdd, pMac->scan.hTimerStaApConcTimer,
- pCommand->u.scanCmd.u.scanRequest.restTime * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
+ vos_timer_start(&pMac->scan.hTimerStaApConcTimer,
+ pCommand->u.scanCmd.u.scanRequest.restTime);
} else {
/* if no connected sessions present then initiate next scan command immediately */
/* minimum timer granularity is 10ms */
- palTimerStart(pMac->hHdd, pMac->scan.hTimerStaApConcTimer, 10 * 1000, eANI_BOOLEAN_FALSE);
+ vos_timer_start(&pMac->scan.hTimerStaApConcTimer, 10);
}
}
#endif
@@ -5844,7 +5844,7 @@
if(pMac->scan.fScanEnable)
{
- status = palTimerStart(pMac->hHdd, pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL, eANI_BOOLEAN_TRUE);
+ status = vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/PAL_TIMER_TO_MS_UNIT);
}
else
{
@@ -5857,7 +5857,7 @@
eHalStatus csrScanStopGetResultTimer(tpAniSirGlobal pMac)
{
- return (palTimerStop(pMac->hHdd, pMac->scan.hTimerGetResult));
+ return (vos_timer_stop(&pMac->scan.hTimerGetResult));
}
@@ -5866,6 +5866,8 @@
tpAniSirGlobal pMac = PMAC_STRUCT( pv );
csrScanRequestResult(pMac);
+
+ vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/PAL_TIMER_TO_MS_UNIT);
}
#ifdef WLAN_AP_STA_CONCURRENCY
@@ -6013,7 +6015,7 @@
if(pMac->scan.fScanEnable)
{
- status = palTimerStart(pMac->hHdd, pMac->scan.hTimerResultAging, CSR_SCAN_RESULT_AGING_INTERVAL, eANI_BOOLEAN_TRUE);
+ status = vos_timer_start(&pMac->scan.hTimerResultAging, CSR_SCAN_RESULT_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
}
return (status);
}
@@ -6024,20 +6026,19 @@
if(pMac->scan.fScanEnable)
{
- status = palTimerStart(pMac->hHdd, pMac->scan.hTimerResultCfgAging,
- CSR_SCAN_RESULT_CFG_AGING_INTERVAL, eANI_BOOLEAN_TRUE);
+ status = vos_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
}
return (status);
}
eHalStatus csrScanStopResultAgingTimer(tpAniSirGlobal pMac)
{
- return (palTimerStop(pMac->hHdd, pMac->scan.hTimerResultAging));
+ return (vos_timer_stop(&pMac->scan.hTimerResultAging));
}
eHalStatus csrScanStopResultCfgAgingTimer(tpAniSirGlobal pMac)
{
- return (palTimerStop(pMac->hHdd, pMac->scan.hTimerResultCfgAging));
+ return (vos_timer_stop(&pMac->scan.hTimerResultCfgAging));
}
//This function returns the maximum time a BSS is allowed in the scan result.
@@ -6135,6 +6136,7 @@
}
csrLLUnlock(&pMac->scan.scanResultList);
}
+ vos_timer_start(&pMac->scan.hTimerResultAging, CSR_SCAN_RESULT_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
}
static void csrScanResultCfgAgingTimerHandler(void *pv)
@@ -6159,6 +6161,7 @@
pEntry = tmpEntry;
}
csrLLUnlock(&pMac->scan.scanResultList);
+ vos_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
}
eHalStatus csrScanStartIdleScanTimer(tpAniSirGlobal pMac, tANI_U32 interval)
@@ -6169,8 +6172,8 @@
if((pMac->scan.fScanEnable) && (eANI_BOOLEAN_FALSE == pMac->scan.fCancelIdleScan) && interval)
{
pMac->scan.nIdleScanTimeGap += interval;
- palTimerStop(pMac->hHdd, pMac->scan.hTimerIdleScan);
- status = palTimerStart(pMac->hHdd, pMac->scan.hTimerIdleScan, interval, eANI_BOOLEAN_FALSE);
+ vos_timer_stop(&pMac->scan.hTimerIdleScan);
+ status = vos_timer_start(&pMac->scan.hTimerIdleScan, interval/PAL_TIMER_TO_MS_UNIT);
if( !HAL_STATUS_SUCCESS(status) )
{
smsLog(pMac, LOGE, " Fail to start Idle scan timer. status = %d interval = %d", status, interval);
@@ -6193,7 +6196,7 @@
eHalStatus csrScanStopIdleScanTimer(tpAniSirGlobal pMac)
{
- return (palTimerStop(pMac->hHdd, pMac->scan.hTimerIdleScan));
+ return (vos_timer_stop(&pMac->scan.hTimerIdleScan));
}
@@ -7572,7 +7575,7 @@
}
fDupBss = csrRemoveDupBssDescription( pMac,
- &pScanResult->Result.BssDescriptor, pIesLocal, &tmpSsid , &timer, FALSE);
+ &pScanResult->Result.BssDescriptor, pIesLocal, &tmpSsid, &timer, FALSE);
//Check whether we have reach out limit
if ( CSR_SCAN_IS_OVER_BSS_LIMIT(pMac) )
{
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index 15e21b2..5cdd498 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -583,8 +583,8 @@
}
/* We dont need to run this timer any more. */
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->emptyScanRefreshTimer);
csrNeighborRoamTriggerHandoff(pMac, pNeighborRoamInfo);
@@ -618,13 +618,13 @@
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
/* Stop neighbor scan timer */
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
/* Stop neighbor scan results refresh timer */
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborResultsRefreshTimer);
/* Stop empty scan results refresh timer */
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->emptyScanRefreshTimer);
/* Abort any ongoing scan */
if (eANI_BOOLEAN_TRUE == pNeighborRoamInfo->scanRspPending)
@@ -753,8 +753,8 @@
csrNeighborRoamFreeRoamableBSSList(pMac, &pNeighborRoamInfo->roamableAPList);
/* We dont need to run this timer any more. */
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->emptyScanRefreshTimer);
#ifdef WLAN_FEATURE_VOWIFI_11R
/* Do not free up the preauth done list here */
@@ -785,9 +785,9 @@
#endif
/* Stop scan refresh timer */
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborResultsRefreshTimer);
/* Stop empty scan results refresh timer */
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->emptyScanRefreshTimer);
/* Purge roamable AP list */
csrNeighborRoamFreeRoamableBSSList(pMac, &pNeighborRoamInfo->roamableAPList);
return;
@@ -1180,10 +1180,9 @@
}
/* Start the neighbor results refresh timer and transition to REPORT_SCAN state to perform scan again */
- status = palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer,
- pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE);
- if (eHAL_STATUS_SUCCESS != status)
+ status = vos_timer_start(&pNeighborRoamInfo->neighborResultsRefreshTimer,
+ pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod);
+ if ( status != eHAL_STATUS_SUCCESS )
{
smsLog(pMac, LOGE, FL("Neighbor results refresh timer start failed with status %d"), status);
}
@@ -1685,11 +1684,7 @@
#endif
/* Stop neighbor scan timer */
- status = palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
- if (eHAL_STATUS_SUCCESS != status)
- {
- smsLog(pMac, LOGW, FL("stopping neighborScanTimer failed with status %d"), status);
- }
+ vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
/*
* Increase the neighbor lookup threshold by 3 dB
@@ -1797,10 +1792,9 @@
pNeighborRoamInfo->uScanMode = SPLIT_SCAN_OCCUPIED_LIST;
/* Start empty scan refresh timer */
- if (eHAL_STATUS_SUCCESS !=
- palTimerStart(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer,
- pNeighborRoamInfo->cfgParams.emptyScanRefreshPeriod * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE))
+ if (VOS_STATUS_SUCCESS !=
+ vos_timer_start(&pNeighborRoamInfo->emptyScanRefreshTimer,
+ pNeighborRoamInfo->cfgParams.emptyScanRefreshPeriod))
{
smsLog(pMac, LOGE, FL("Empty scan refresh timer failed to start (%d)"),
status);
@@ -1818,10 +1812,9 @@
else if (eThirdEmptyScan == pNeighborRoamInfo->uEmptyScanCount)
{
/* Start neighbor scan results refresh timer */
- if (eHAL_STATUS_SUCCESS !=
- palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer,
- pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE))
+ if (VOS_STATUS_SUCCESS !=
+ vos_timer_start(&pNeighborRoamInfo->neighborResultsRefreshTimer,
+ pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod))
{
smsLog(pMac, LOGE, FL("Neighbor results refresh timer failed to start (%d)"),
status);
@@ -1946,7 +1939,7 @@
need to restart the CFG CHAN list scan procedure if reassoc callback is not invoked from TL
within certain duration */
-// palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
+// vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
}
}
else
@@ -2013,13 +2006,12 @@
return eHAL_STATUS_SUCCESS;
}
- hstatus = palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer,
- pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE);
+ hstatus = vos_timer_start(&pNeighborRoamInfo->neighborResultsRefreshTimer,
+ pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod);
/* This timer should be started before registering the Reassoc callback with TL. This is because, it is very likely
* that the callback getting called immediately and the timer would never be stopped when pre-auth is in progress */
- if (eHAL_STATUS_SUCCESS != hstatus)
+ if( hstatus != eHAL_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Neighbor results refresh timer failed to start, status = %d"), hstatus);
vos_mem_free(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList);
@@ -2167,10 +2159,8 @@
{
/* Restart the timer for the next scan sequence as scanning is not over */
- hstatus = palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer,
- pNeighborRoamInfo->cfgParams.neighborScanPeriod * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE);
-
+ hstatus = vos_timer_start(&pNeighborRoamInfo->neighborScanTimer,
+ pNeighborRoamInfo->cfgParams.neighborScanPeriod);
if (eHAL_STATUS_SUCCESS != hstatus)
{
/* Timer start failed.. Should we ASSERT here??? */
@@ -3064,9 +3054,8 @@
/* Now ready for neighbor scan based on the channel list created */
/* Start Neighbor scan timer now. Multiplication by PAL_TIMER_TO_MS_UNIT is to convert ms to us which is
what palTimerStart expects */
- status = palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer,
- pNeighborRoamInfo->cfgParams.neighborScanPeriod * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE);
+ status = vos_timer_start(&pNeighborRoamInfo->neighborScanTimer,
+ pNeighborRoamInfo->cfgParams.neighborScanPeriod);
if (eHAL_STATUS_SUCCESS != status)
{
/* Timer start failed.. Should we ASSERT here??? */
@@ -3406,7 +3395,7 @@
pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
/* We are about to start a fresh scan cycle,
* purge non-P2P results from the past */
@@ -3565,12 +3554,11 @@
/* We are gonna scan now. Remember the time stamp to filter out results only after this timestamp */
pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
/* Start Neighbor scan timer now. Multiplication by PAL_TIMER_TO_MS_UNIT is to convert ms to us which is
what palTimerStart expects */
- status = palTimerStart(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer,
- pNeighborRoamInfo->cfgParams.neighborScanPeriod * PAL_TIMER_TO_MS_UNIT,
- eANI_BOOLEAN_FALSE);
+ status = vos_timer_start(&pNeighborRoamInfo->neighborScanTimer,
+ pNeighborRoamInfo->cfgParams.neighborScanPeriod);
if (eHAL_STATUS_SUCCESS != status)
{
@@ -3895,9 +3883,9 @@
// Stop scan and neighbor refresh timers.
// These are indeed not required when we are in reassociating
// state.
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
- palTimerStop(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_stop(&pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_stop(&pNeighborRoamInfo->emptyScanRefreshTimer);
if (!CSR_IS_ROAM_SUBSTATE_DISASSOC_HO( pMac, sessionId )) {
/*
* Disconnect indication during Disassoc Handoff sub-state
@@ -3952,7 +3940,7 @@
case eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE:
/* Stop pre-auth to reassoc interval timer */
- palTimerStop(pMac->hHdd, pMac->ft.ftSmeContext.preAuthReassocIntvlTimer);
+ vos_timer_stop(&pMac->ft.ftSmeContext.preAuthReassocIntvlTimer);
case eCSR_NEIGHBOR_ROAM_STATE_REPORT_SCAN:
case eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING:
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT)
@@ -4306,7 +4294,7 @@
pNeighborRoamInfo->neighborScanTimerInfo.pMac = pMac;
pNeighborRoamInfo->neighborScanTimerInfo.sessionId = CSR_SESSION_ID_INVALID;
- status = palTimerAlloc(pMac->hHdd, &pNeighborRoamInfo->neighborScanTimer,
+ status = vos_timer_init(&pNeighborRoamInfo->neighborScanTimer, VOS_TIMER_TYPE_SW,
csrNeighborRoamNeighborScanTimerCallback, (void *)&pNeighborRoamInfo->neighborScanTimerInfo);
if (eHAL_STATUS_SUCCESS != status)
@@ -4317,7 +4305,7 @@
return eHAL_STATUS_RESOURCES;
}
- status = palTimerAlloc(pMac->hHdd, &pNeighborRoamInfo->neighborResultsRefreshTimer,
+ status = vos_timer_init(&pNeighborRoamInfo->neighborResultsRefreshTimer, VOS_TIMER_TYPE_SW,
csrNeighborRoamResultsRefreshTimerCallback, (void *)&pNeighborRoamInfo->neighborScanTimerInfo);
if (eHAL_STATUS_SUCCESS != status)
@@ -4325,11 +4313,11 @@
smsLog(pMac, LOGE, FL("Neighbor results refresh timer allocation failed"));
vos_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList);
pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborScanTimer);
return eHAL_STATUS_RESOURCES;
}
- status = palTimerAlloc(pMac->hHdd, &pNeighborRoamInfo->emptyScanRefreshTimer,
+ status = vos_timer_init(&pNeighborRoamInfo->emptyScanRefreshTimer, VOS_TIMER_TYPE_SW,
csrNeighborRoamEmptyScanRefreshTimerCallback,
(void *)&pNeighborRoamInfo->neighborScanTimerInfo);
@@ -4338,8 +4326,8 @@
smsLog(pMac, LOGE, FL("Empty scan refresh timer allocation failed"));
vos_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList);
pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborResultsRefreshTimer);
return eHAL_STATUS_RESOURCES;
}
@@ -4349,9 +4337,9 @@
smsLog(pMac, LOGE, FL("LL Open of roamable AP List failed"));
vos_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList);
pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->emptyScanRefreshTimer);
return eHAL_STATUS_RESOURCES;
}
@@ -4368,9 +4356,9 @@
smsLog(pMac, LOGE, FL("LL Open of roamable AP List failed"));
vos_mem_free(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList);
pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL;
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->emptyScanRefreshTimer);
csrLLClose(&pNeighborRoamInfo->roamableAPList);
return eHAL_STATUS_RESOURCES;
}
@@ -4411,9 +4399,9 @@
pNeighborRoamInfo->neighborScanTimerInfo.pMac = NULL;
pNeighborRoamInfo->neighborScanTimerInfo.sessionId = CSR_SESSION_ID_INVALID;
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborScanTimer);
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->neighborResultsRefreshTimer);
- palTimerFree(pMac->hHdd, pNeighborRoamInfo->emptyScanRefreshTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborScanTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->neighborResultsRefreshTimer);
+ vos_timer_destroy(&pNeighborRoamInfo->emptyScanRefreshTimer);
/* Should free up the nodes in the list before closing the double Linked list */
csrNeighborRoamFreeRoamableBSSList(pMac, &pNeighborRoamInfo->roamableAPList);
@@ -4656,7 +4644,7 @@
eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) return;
// Stop timer
- palTimerStop(pMac->hHdd, pMac->ft.ftSmeContext.preAuthReassocIntvlTimer);
+ vos_timer_stop(&pMac->ft.ftSmeContext.preAuthReassocIntvlTimer);
// Transition to init state
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT)
diff --git a/CORE/SME/src/p2p/p2p_Api.c b/CORE/SME/src/p2p/p2p_Api.c
index 87be42b..e243014 100644
--- a/CORE/SME/src/p2p/p2p_Api.c
+++ b/CORE/SME/src/p2p/p2p_Api.c
@@ -315,9 +315,8 @@
if(NULL == pP2pContext->pNextActionFrm)
{
- status = palTimerStart(pMac->hHdd, pP2pContext->retryActionFrameTimer,
- ACTION_FRAME_RETRY_TIMEOUT * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
- if (!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_start(&pP2pContext->retryActionFrameTimer, ACTION_FRAME_RETRY_TIMEOUT);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, " %s fail to start retryActionFrameTimerHandler",
__func__, pP2pContext->NextActionFrameType);
@@ -336,12 +335,14 @@
if (pP2pContext->actionFrameTimer)
{
- status = palTimerStop(pMac, pP2pContext->actionFrameTimer);
+ vos_timer_stop(&pP2pContext->actionFrameTimer);
+ status = eHAL_STATUS_SUCCESS;
}
if (pP2pContext->retryActionFrameTimer)
{
- status = palTimerStop(pMac, pP2pContext->retryActionFrameTimer);
+ vos_timer_stop(&pP2pContext->retryActionFrameTimer);
+ status = eHAL_STATUS_SUCCESS;
}
if(pP2pContext->pSentActionFrame)
@@ -390,9 +391,8 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, " sending next frame %d type",
pP2pContext->NextActionFrameType);
- status = palTimerStart(pMac->hHdd, pP2pContext->actionFrameTimer,
- pP2pContext->ActionFrameSendTimeout * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
- if (!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_start(&pP2pContext->actionFrameTimer, pP2pContext->ActionFrameSendTimeout);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, FL(" %s fail to start timer status %d"), __func__, status);
//Without the timer we cannot continue
@@ -414,9 +414,8 @@
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, " sending next frame %d type",
pP2pContext->NextActionFrameType);
- status = palTimerStart(pMac->hHdd, pP2pContext->retryActionFrameTimer,
- ACTION_FRAME_RETRY_TIMEOUT * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
- if (!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_start(&pP2pContext->retryActionFrameTimer, ACTION_FRAME_RETRY_TIMEOUT);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, " %s fail to start retryActionFrameTimerHandler", __func__);
}
@@ -535,22 +534,22 @@
if (pP2pContext->actionFrameTimer)
{
- palTimerStop(pMac->hHdd, pP2pContext->actionFrameTimer);
+ vos_timer_stop(&pP2pContext->actionFrameTimer);
}
if (pP2pContext->discoverTimer)
{
- palTimerStop(pMac->hHdd, pP2pContext->discoverTimer);
+ vos_timer_stop(&pP2pContext->discoverTimer);
}
if (pP2pContext->listenTimerHandler)
{
- palTimerStop(pMac->hHdd, pP2pContext->listenTimerHandler);
+ vos_timer_stop(&pP2pContext->listenTimerHandler);
}
if (pP2pContext->WPSRegistrarCheckTimerHandler)
{
- palTimerStop(pMac->hHdd, pP2pContext->WPSRegistrarCheckTimerHandler);
+ vos_timer_stop(&pP2pContext->WPSRegistrarCheckTimerHandler);
}
if (pP2pContext->directedDiscoveryFilter)
@@ -588,30 +587,29 @@
p2pResetContext(pP2pContext);
- status = palTimerAlloc(pMac->hHdd, &pP2pContext->actionFrameTimer,
- p2pActionFrameTimerHandler, pP2pContext);
- if (!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pP2pContext->actionFrameTimer, VOS_TIMER_TYPE_SW, p2pActionFrameTimerHandler, pP2pContext);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, " %s fail to alloc actionFrame timer for session %d", __func__, i);
break;
}
- status = palTimerAlloc(pMac->hHdd, &pP2pContext->listenTimerHandler,
- p2pListenDiscoverTimerHandler, pP2pContext);
- if (!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pP2pContext->listenTimerHandler, VOS_TIMER_TYPE_SW,
+ p2pListenDiscoverTimerHandler, pP2pContext);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, " %s fail to alloc listen timer for session %d", __func__, i);
break;
}
- status = palTimerAlloc(pMac->hHdd, &pP2pContext->discoverTimer, p2pDiscoverTimerHandler, pP2pContext);
- if (!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_init(&pP2pContext->discoverTimer, VOS_TIMER_TYPE_SW, p2pDiscoverTimerHandler, pP2pContext);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, " %s fail to alloc discover timer for session %d", __func__, i);
break;
}
- status = palTimerAlloc(pMac->hHdd, &pP2pContext->retryActionFrameTimer,
+ status = vos_timer_init(&pP2pContext->retryActionFrameTimer, VOS_TIMER_TYPE_SW,
p2pRetryActionFrameTimerHandler, pP2pContext);
- if (!HAL_STATUS_SUCCESS(status))
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
smsLog(pMac, LOGE, " %s fail to alloc retryActionFrameTimerHandler timer for session %d", __func__, i);
break;
@@ -674,25 +672,25 @@
pContext = &pMac->p2pContext[i];
if (pContext->actionFrameTimer)
{
- palTimerFree(hHal, pContext->actionFrameTimer);
+ vos_timer_destroy(&pContext->actionFrameTimer);
pContext->actionFrameTimer = NULL;
}
if (pContext->discoverTimer)
{
- palTimerFree(hHal, pContext->discoverTimer);
+ vos_timer_destroy(&pContext->discoverTimer);
pContext->discoverTimer = NULL;
}
if (pContext->listenTimerHandler)
{
- palTimerFree(hHal, pContext->listenTimerHandler);
+ vos_timer_destroy(&pContext->listenTimerHandler);
pContext->listenTimerHandler = NULL;
}
if (pContext->WPSRegistrarCheckTimerHandler)
{
- palTimerFree(hHal, pContext->WPSRegistrarCheckTimerHandler);
+ vos_timer_destroy(&pContext->WPSRegistrarCheckTimerHandler);
pContext->WPSRegistrarCheckTimerHandler = NULL;
}
@@ -1410,9 +1408,9 @@
pP2pContext->ActionFrameSendTimeout = WLAN_P2P_DEF_ACTION_FRM_TIMEOUT_VALUE;
}
- status = palTimerStart(pMac->hHdd, pP2pContext->actionFrameTimer,
- pP2pContext->ActionFrameSendTimeout * PAL_TIMER_TO_MS_UNIT, eANI_BOOLEAN_FALSE);
- if (!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_start(&pP2pContext->actionFrameTimer,
+ pP2pContext->ActionFrameSendTimeout);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
tCsrRoamInfo RoamInfo;
@@ -1498,8 +1496,8 @@
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s restart listen timer expire time %d",
__func__, p2pContext->expire_time);
//We can restart the listening
- status = palTimerStart(pMac->hHdd, p2pContext->listenTimerHandler, p2pContext->expire_time, eANI_BOOLEAN_FALSE);
- if (eHAL_STATUS_SUCCESS != status)
+ status = vos_timer_start(&p2pContext->listenTimerHandler, (p2pContext->expire_time)/PAL_TIMER_TO_MS_UNIT);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
VOS_ASSERT(status);
}
@@ -1532,7 +1530,8 @@
if (pMac->p2pContext[sessionId].listenTimerHandler)
{
- status = palTimerStop(pMac->hHdd, pMac->p2pContext[sessionId].listenTimerHandler);
+ vos_timer_stop(&pMac->p2pContext[sessionId].listenTimerHandler);
+ status = eHAL_STATUS_SUCCESS;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s Timer Stop status %d",
__func__, status);
}
@@ -1912,9 +1911,9 @@
pP2pContext->uDiscoverTimeout = pDiscoverRequest->uDiscoverTimeout;
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_MED, "%s Start discover", __func__);
- status = palTimerStart(pMac->hHdd, pP2pContext->discoverTimer,
- pP2pContext->uDiscoverTimeout * 1000, eANI_BOOLEAN_FALSE);
- if(!HAL_STATUS_SUCCESS(status))
+ status = vos_timer_start(&pP2pContext->discoverTimer,
+ pP2pContext->uDiscoverTimeout);
+ if (!VOS_IS_STATUS_SUCCESS(status))
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
"%s failt to start discover timer", __func__);
@@ -2120,7 +2119,7 @@
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
eHalStatus status = eHAL_STATUS_SUCCESS;
- status = palTimerStop(pMac->hHdd, pMac->p2pContext[SessionID].discoverTimer);
+ status = vos_timer_stop(&pMac->p2pContext[SessionID].discoverTimer);
if (status != eHAL_STATUS_SUCCESS)
{
VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s Timer Stop status %d", __func__, status);
diff --git a/CORE/SME/src/pmc/pmc.c b/CORE/SME/src/pmc/pmc.c
index d27e9a0..55528e8 100644
--- a/CORE/SME/src/pmc/pmc.c
+++ b/CORE/SME/src/pmc/pmc.c
@@ -94,7 +94,7 @@
return eHAL_STATUS_SUCCESS;
/* Cancel any running timers. */
- if (palTimerStop(pMac->hHdd, pMac->pmc.hImpsTimer) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_stop(&pMac->pmc.hImpsTimer) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot cancel IMPS timer"));
return eHAL_STATUS_FAILURE;
@@ -102,7 +102,7 @@
pmcStopTrafficTimer(hHal);
- if (palTimerStop(pMac->hHdd, pMac->pmc.hExitPowerSaveTimer) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_stop(&pMac->pmc.hExitPowerSaveTimer) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot cancel exit power save mode timer"));
return eHAL_STATUS_FAILURE;
@@ -477,7 +477,7 @@
/* Set timer to come out of IMPS.only if impsPeriod is non-Zero*/
if(0 != pMac->pmc.impsPeriod)
{
- if (palTimerStart(pMac->hHdd, pMac->pmc.hImpsTimer, pMac->pmc.impsPeriod * 1000, FALSE) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_start(&pMac->pmc.hImpsTimer, pMac->pmc.impsPeriod) != VOS_STATUS_SUCCESS)
{
PMC_ABORT;
pMac->pmc.ImpsReqTimerFailed = VOS_TRUE;
@@ -2610,6 +2610,7 @@
{
smsLog(pMac, LOGP, FL("Cannot re-arm DIAG evt timer"));
}
+ vos_timer_start(&pMac->pmc.hDiagEvtTimer, PMC_DIAG_EVT_TIMER_INTERVAL);
}
eHalStatus pmcStartDiagEvtTimer (tHalHandle hHal)
@@ -2618,8 +2619,7 @@
smsLog(pMac, LOG2, FL("Entering pmcStartDiagEvtTimer"));
- if (palTimerStart(pMac->hHdd, pMac->pmc.hDiagEvtTimer, PMC_DIAG_EVT_TIMER_INTERVAL *
- 1000, TRUE) != eHAL_STATUS_SUCCESS)
+ if ( vos_timer_start(&pMac->pmc.hDiagEvtTimer, PMC_DIAG_EVT_TIMER_INTERVAL) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGP, FL("Cannot start DIAG evt timer"));
return eHAL_STATUS_FAILURE;
@@ -2632,6 +2632,6 @@
{
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
smsLog(pMac, LOG2, FL("Entering pmcStopDiagEvtTimer"));
- (void)palTimerStop(pMac->hHdd, pMac->pmc.hDiagEvtTimer);
+ (void)vos_timer_stop(&pMac->pmc.hDiagEvtTimer);
}
#endif
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index c2ba18a..341660e 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -101,7 +101,7 @@
palZeroMemory(pMac->hHdd, &(pMac->pmc.smpsConfig), sizeof(tPmcSmpsConfigParams));
/* Allocate a timer to use with IMPS. */
- if (palTimerAlloc(pMac->hHdd, &pMac->pmc.hImpsTimer, pmcImpsTimerExpired, hHal) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_init(&pMac->pmc.hImpsTimer, VOS_TIMER_TYPE_SW, pmcImpsTimerExpired, hHal) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot allocate timer for IMPS"));
return eHAL_STATUS_FAILURE;
@@ -118,7 +118,7 @@
#ifdef FEATURE_WLAN_DIAG_SUPPORT
/* Allocate a timer used to report current PMC state through periodic DIAG event */
- if (palTimerAlloc(pMac->hHdd, &pMac->pmc.hDiagEvtTimer, pmcDiagEvtTimerExpired, hHal) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_init(&pMac->pmc.hDiagEvtTimer, VOS_TIMER_TYPE_SW, pmcDiagEvtTimerExpired, hHal) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot allocate timer for diag event reporting"));
return eHAL_STATUS_FAILURE;
@@ -130,8 +130,8 @@
pMac->pmc.bmpsConfig.bmpsPeriod = WNI_CFG_LISTEN_INTERVAL_STADEF;
/* Allocate a timer used to schedule a deferred power save mode exit. */
- if (palTimerAlloc(pMac->hHdd, &pMac->pmc.hExitPowerSaveTimer,
- pmcExitPowerSaveTimerExpired, hHal) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_init(&pMac->pmc.hExitPowerSaveTimer, VOS_TIMER_TYPE_SW,
+ pmcExitPowerSaveTimerExpired, hHal) !=VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot allocate exit power save mode timer"));
PMC_ABORT;
@@ -291,7 +291,7 @@
smsLog(pMac, LOG2, FL("Entering pmcStop"));
/* Cancel any running timers. */
- if (palTimerStop(pMac->hHdd, pMac->pmc.hImpsTimer) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_stop(&pMac->pmc.hImpsTimer) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot cancel IMPS timer"));
}
@@ -302,7 +302,7 @@
pmcStopDiagEvtTimer(hHal);
#endif
- if (palTimerStop(pMac->hHdd, pMac->pmc.hExitPowerSaveTimer) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_stop(&pMac->pmc.hExitPowerSaveTimer) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot cancel exit power save mode timer"));
}
@@ -353,7 +353,7 @@
smsLog(pMac, LOG2, FL("Entering pmcClose"));
/* Free up allocated resources. */
- if (palTimerFree(pMac->hHdd, pMac->pmc.hImpsTimer) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_destroy(&pMac->pmc.hImpsTimer) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot deallocate IMPS timer"));
}
@@ -362,12 +362,12 @@
smsLog(pMac, LOGE, FL("Cannot deallocate traffic timer"));
}
#ifdef FEATURE_WLAN_DIAG_SUPPORT
- if (palTimerFree(pMac->hHdd, pMac->pmc.hDiagEvtTimer) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_destroy(&pMac->pmc.hDiagEvtTimer) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot deallocate timer for diag event reporting"));
}
#endif
- if (palTimerFree(pMac->hHdd, pMac->pmc.hExitPowerSaveTimer) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_destroy(&pMac->pmc.hExitPowerSaveTimer) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot deallocate exit power save mode timer"));
}
@@ -1040,12 +1040,10 @@
/* If in IMPS State, then cancel the timer. */
if (pMac->pmc.pmcState == IMPS)
- if (palTimerStop(pMac->hHdd, pMac->pmc.hImpsTimer) != eHAL_STATUS_SUCCESS)
+ if (vos_timer_stop(&pMac->pmc.hImpsTimer) != VOS_STATUS_SUCCESS)
{
smsLog(pMac, LOGE, FL("Cannot cancel IMPS timer"));
- return eHAL_STATUS_FAILURE;
}
-
/* Enter Request Full Power State. */
if (pmcEnterRequestFullPowerState(hHal, fullPowerReason) != eHAL_STATUS_SUCCESS)
return eHAL_STATUS_FAILURE;
@@ -2779,7 +2777,7 @@
tANI_U8* pBD,
tANI_U8 type,
tANI_U8 subType,
- tSirMacAddr peerAddr ,
+ tSirMacAddr peerAddr,
tSirMacAddr selfMacAddr)
{
tSirRetStatus statusCode = eSIR_SUCCESS;
@@ -2870,7 +2868,7 @@
// Next, we fill out the buffer descriptor:
nSirStatus = pmcPopulateMacHeader( pMac, pFrame, SIR_MAC_MGMT_FRAME,
- SIR_MAC_MGMT_PROBE_REQ, bssId ,selfMacAddr);
+ SIR_MAC_MGMT_PROBE_REQ, bssId,selfMacAddr);
if ( eSIR_SUCCESS != nSirStatus )
{
diff --git a/CORE/SME/src/sme_common/sme_FTApi.c b/CORE/SME/src/sme_common/sme_FTApi.c
index 929592b..39bc16f 100644
--- a/CORE/SME/src/sme_common/sme_FTApi.c
+++ b/CORE/SME/src/sme_common/sme_FTApi.c
@@ -72,7 +72,7 @@
pMac->ft.ftSmeContext.reassoc_ft_ies_length = 0;
pMac->ft.ftSmeContext.setFTPreAuthState = FALSE;
pMac->ft.ftSmeContext.setFTPTKState = FALSE;
- status = palTimerAlloc(pMac->hHdd, &pMac->ft.ftSmeContext.preAuthReassocIntvlTimer,
+ status = vos_timer_init(&pMac->ft.ftSmeContext.preAuthReassocIntvlTimer,VOS_TIMER_TYPE_SW,
sme_PreauthReassocIntvlTimerCallback, (void *)pMac);
if (eHAL_STATUS_SUCCESS != status)
@@ -129,7 +129,7 @@
pMac->ft.ftSmeContext.psavedFTPreAuthRsp = NULL;
}
- palTimerFree(pMac->hHdd, pMac->ft.ftSmeContext.preAuthReassocIntvlTimer);
+ vos_timer_destroy(&pMac->ft.ftSmeContext.preAuthReassocIntvlTimer);
}
void sme_SetFTPreAuthState(tHalHandle hHal, v_BOOL_t state)