wlan: Remove obsolete palTimer code

Removing legacy palTimer code and references to these files.
However, since some files still depend on 2 macros defined
in palTimer.h, redefine these macros in vos_timer.h and rename
them appropriately.

Change-Id: Iecf731beced156ab57acbe956dfc9486c5d3c5c2
CRs-Fixed: 701497

21 files changed, 38 insertions, 366 deletions

diff --git a/CORE/EPPING/src/epping_helper.c b/CORE/EPPING/src/epping_helper.c
index 353b4bdef823..fb720de2ba04 100644
--- a/CORE/EPPING/src/epping_helper.c
+++ b/CORE/EPPING/src/epping_helper.c
@@ -46,7 +46,6 @@
 #include <linux/delay.h>
 #include <wcnss_api.h>
 #include <wlan_hdd_tx_rx.h>
-#include <palTimer.h>
 #include <wniApi.h>
 #include <wlan_nlink_srv.h>
 #include <wlan_btc_svc.h>
diff --git a/CORE/EPPING/src/epping_main.c b/CORE/EPPING/src/epping_main.c
index 3bb63e857f01..cfd8338b5ed1 100644
--- a/CORE/EPPING/src/epping_main.c
+++ b/CORE/EPPING/src/epping_main.c
@@ -45,7 +45,6 @@
 #include <linux/firmware.h>
 #include <wcnss_api.h>
 #include <wlan_hdd_tx_rx.h>
-#include <palTimer.h>
 #include <wniApi.h>
 #include <wlan_nlink_srv.h>
 #include <wlan_btc_svc.h>
diff --git a/CORE/EPPING/src/epping_rx.c b/CORE/EPPING/src/epping_rx.c
index cb9e6c795083..909729956894 100644
--- a/CORE/EPPING/src/epping_rx.c
+++ b/CORE/EPPING/src/epping_rx.c
@@ -45,7 +45,6 @@
 #include <linux/firmware.h>
 #include <wcnss_api.h>
 #include <wlan_hdd_tx_rx.h>
-#include <palTimer.h>
 #include <wniApi.h>
 #include <wlan_nlink_srv.h>
 #include <wlan_btc_svc.h>
diff --git a/CORE/EPPING/src/epping_tx.c b/CORE/EPPING/src/epping_tx.c
index 2499e15f1c21..75f6a0cc6fad 100644
--- a/CORE/EPPING/src/epping_tx.c
+++ b/CORE/EPPING/src/epping_tx.c
@@ -45,7 +45,6 @@
 #include <linux/firmware.h>
 #include <wcnss_api.h>
 #include <wlan_hdd_tx_rx.h>
-#include <palTimer.h>
 #include <wniApi.h>
 #include <wlan_nlink_srv.h>
 #include <wlan_btc_svc.h>
diff --git a/CORE/EPPING/src/epping_txrx.c b/CORE/EPPING/src/epping_txrx.c
index cf2a7d4074d3..bd8c7154687f 100644
--- a/CORE/EPPING/src/epping_txrx.c
+++ b/CORE/EPPING/src/epping_txrx.c
@@ -45,7 +45,6 @@
 #include <linux/firmware.h>
 #include <wcnss_api.h>
 #include <wlan_hdd_tx_rx.h>
-#include <palTimer.h>
 #include <wniApi.h>
 #include <wlan_nlink_srv.h>
 #include <wlan_btc_svc.h>
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 5a9493e34914..ec16099fd152 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -67,7 +67,6 @@
 #include <linux/firmware.h>
 #include <wcnss_api.h>
 #include <wlan_hdd_tx_rx.h>
-#include <palTimer.h>
 #include <wniApi.h>
 #include <wlan_nlink_srv.h>
 #include <wlan_btc_svc.h>
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index eac4e1f3b818..01efc56769ba 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -39,7 +39,7 @@
 #include "vos_status.h"
 #include "vos_lock.h"
 
-#include "palTimer.h"
+#include "vos_timer.h"
 #include "csrSupport.h"
 #include "vos_nvitem.h"
 #include "wlan_qct_tl.h"
@@ -716,7 +716,6 @@ typedef struct tagCsrScanStruct
     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;
     tANI_U8 scanResultCfgAgingTime;
diff --git a/CORE/SME/inc/oemDataInternal.h b/CORE/SME/inc/oemDataInternal.h
index e914562fb1b1..99742f127ee0 100644
--- a/CORE/SME/inc/oemDataInternal.h
+++ b/CORE/SME/inc/oemDataInternal.h
@@ -40,7 +40,6 @@
 #ifndef __OEM_DATA_INTERNAL_H__
 #define __OEM_DATA_INTERNAL_H__
 
-#include "palTimer.h"
 #include "csrSupport.h"
 #include "vos_nvitem.h"
 #include "wlan_qct_tl.h"
diff --git a/CORE/SME/inc/p2p_Api.h b/CORE/SME/inc/p2p_Api.h
index 37cfbc0e4f26..4a04c84997fa 100644
--- a/CORE/SME/inc/p2p_Api.h
+++ b/CORE/SME/inc/p2p_Api.h
@@ -40,7 +40,7 @@
 
 #include "vos_types.h"
 #include "halTypes.h"
-#include "palTimer.h"
+#include "vos_timer.h"
 #include "vos_lock.h"
 
 typedef struct sP2pPsConfig{
diff --git a/CORE/SME/inc/pmc.h b/CORE/SME/inc/pmc.h
index 2d9b151fdf73..ff618b4c33f9 100644
--- a/CORE/SME/inc/pmc.h
+++ b/CORE/SME/inc/pmc.h
@@ -39,7 +39,6 @@
 #define __PMC_H__
 
 
-#include "palTimer.h"
 #include "csrLinkList.h"
 #include "pmcApi.h"
 #include "smeInternal.h"
diff --git a/CORE/SME/inc/smeRrmInternal.h b/CORE/SME/inc/smeRrmInternal.h
index e0a1e0fa00f0..20a90e40e38b 100644
--- a/CORE/SME/inc/smeRrmInternal.h
+++ b/CORE/SME/inc/smeRrmInternal.h
@@ -46,7 +46,6 @@
 #include "vos_trace.h"
 #include "vos_memory.h"
 #include "vos_types.h"
-#include "palTimer.h"
 #include "rrmGlobal.h"
 
 /*--------------------------------------------------------------------------
diff --git a/CORE/SME/inc/sme_FTApi.h b/CORE/SME/inc/sme_FTApi.h
index f2495c0e3072..b963843db6a3 100644
--- a/CORE/SME/inc/sme_FTApi.h
+++ b/CORE/SME/inc/sme_FTApi.h
@@ -30,7 +30,6 @@
 #define __SME_FTAPI_H
 
 #include <limFTDefs.h>
-#include <palTimer.h>
 
 /**=========================================================================
 
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 65ecff0bf061..e4fb1dde1643 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -69,8 +69,8 @@
 #endif /* FEATURE_WLAN_ESE && !FEATURE_WLAN_ESE_UPLOAD */
 #define CSR_NUM_IBSS_START_CHANNELS_50      4
 #define CSR_NUM_IBSS_START_CHANNELS_24      3
-#define CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD         ( 5 * PAL_TIMER_TO_SEC_UNIT )  // 5 seconds, for WPA, WPA2, CCKM
-#define CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD         ( 120 * PAL_TIMER_TO_SEC_UNIT )  // 120 seconds, for WPS
+#define CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD         ( 5 * VOS_TIMER_TO_SEC_UNIT )  // 5 seconds, for WPA, WPA2, CCKM
+#define CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD         ( 120 * VOS_TIMER_TO_SEC_UNIT )  // 120 seconds, for WPS
 /*---------------------------------------------------------------------------
   OBIWAN recommends [8 10]% : pick 9%
 ---------------------------------------------------------------------------*/
@@ -1708,7 +1708,9 @@ eHalStatus csrChangeDefaultConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pPa
         if (pParam->impsSleepTime)
         {
             //Change the unit from second to microsecond
-            tANI_U32 impsSleepTime = pParam->impsSleepTime * PAL_TIMER_TO_SEC_UNIT;
+            tANI_U32 impsSleepTime =
+                                  pParam->impsSleepTime * VOS_TIMER_TO_SEC_UNIT;
+
             if(CSR_IDLE_SCAN_NO_PS_INTERVAL_MIN <= impsSleepTime)
             {
                 pMac->roam.configParam.impsSleepTime = impsSleepTime;
@@ -1925,7 +1927,8 @@ eHalStatus csrGetConfigParam(tpAniSirGlobal pMac, tCsrConfigParam *pParam)
         pParam->nNumP2PChanCombinedConc = pMac->roam.configParam.nNumP2PChanCombinedConc;
 #endif
         //Change the unit from microsecond to second
-        pParam->impsSleepTime = pMac->roam.configParam.impsSleepTime / PAL_TIMER_TO_SEC_UNIT;
+        pParam->impsSleepTime =
+                   pMac->roam.configParam.impsSleepTime / VOS_TIMER_TO_SEC_UNIT;
         pParam->eBand = pMac->roam.configParam.eBand;
         pParam->nScanResultAgeCount = pMac->roam.configParam.agingCount;
         pParam->scanAgeTimeNCNPS = pMac->roam.configParam.scanAgeTimeNCNPS;
@@ -10667,7 +10670,8 @@ tANI_BOOLEAN csrRoamCompleteRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId,
     else
     {
         pSession->roamResult = roamResult;
-        if(!HAL_STATUS_SUCCESS(csrRoamStartRoamingTimer(pMac, sessionId, PAL_TIMER_TO_SEC_UNIT)))
+        if(!HAL_STATUS_SUCCESS(csrRoamStartRoamingTimer(pMac, sessionId,
+                                                        VOS_TIMER_TO_SEC_UNIT)))
         {
             csrCallRoamingCompletionCallback(pMac, pSession, NULL, 0, roamResult);
             pSession->roamingReason = eCsrNotRoaming;
@@ -10747,7 +10751,8 @@ eHalStatus csrRoamStartRoamingTimer(tpAniSirGlobal pMac, tANI_U32 sessionId, tAN
 
     smsLog(pMac, LOG1, " csrScanStartRoamingTimer");
     pSession->roamingTimerInfo.sessionId = (tANI_U8)sessionId;
-    status = vos_timer_start(&pSession->hTimerRoaming, interval/PAL_TIMER_TO_MS_UNIT);
+    status = vos_timer_start(&pSession->hTimerRoaming,
+                             interval/VOS_TIMER_TO_MS_UNIT);
 
     return (status);
 }
@@ -10844,7 +10849,8 @@ eHalStatus csrRoamStartWaitForKeyTimer(tpAniSirGlobal pMac, tANI_U32 interval)
     }
 #endif
     smsLog(pMac, LOG1, " csrScanStartWaitForKeyTimer");
-    status = vos_timer_start(&pMac->roam.hTimerWaitForKey, interval/PAL_TIMER_TO_MS_UNIT);
+    status = vos_timer_start(&pMac->roam.hTimerWaitForKey,
+                             interval/VOS_TIMER_TO_MS_UNIT);
 
     return (status);
 }
@@ -17781,7 +17787,7 @@ eHalStatus csrRoamStartJoinRetryTimer(tpAniSirGlobal pMac, tANI_U32 sessionId,
         pSession->joinRetryTimerInfo.sessionId = (tANI_U8)sessionId;
         status =
             vos_timer_start(&pSession->hTimerJoinRetry,
-                            interval/PAL_TIMER_TO_MS_UNIT);
+                            interval/VOS_TIMER_TO_MS_UNIT);
         if (!HAL_STATUS_SUCCESS(status))
         {
             smsLog(pMac, LOGE, FL(" fail to start timer status %s"), status);
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 0627330f3151..ad3782b91acc 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -6492,7 +6492,7 @@ eHalStatus csrScanStartGetResultTimer(tpAniSirGlobal pMac)
 
     if(pMac->scan.fScanEnable)
     {
-        status = vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/PAL_TIMER_TO_MS_UNIT);
+        status = vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/VOS_TIMER_TO_MS_UNIT);
     }
     else
     {
@@ -6515,7 +6515,7 @@ void csrScanGetResultTimerHandler(void *pv)
 
     csrScanRequestResult(pMac);
 
-    vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/PAL_TIMER_TO_MS_UNIT);
+    vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/VOS_TIMER_TO_MS_UNIT);
 }
 
 #ifdef WLAN_AP_STA_CONCURRENCY
@@ -6665,7 +6665,7 @@ eHalStatus csrScanStartResultAgingTimer(tpAniSirGlobal pMac)
 
     if(pMac->scan.fScanEnable)
     {
-        status = vos_timer_start(&pMac->scan.hTimerResultAging, CSR_SCAN_RESULT_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
+        status = vos_timer_start(&pMac->scan.hTimerResultAging, CSR_SCAN_RESULT_AGING_INTERVAL/VOS_TIMER_TO_MS_UNIT);
     }
     return (status);
 }
@@ -6676,7 +6676,7 @@ eHalStatus csrScanStartResultCfgAgingTimer(tpAniSirGlobal pMac)
 
     if(pMac->scan.fScanEnable)
     {
-        status = vos_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
+        status = vos_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL/VOS_TIMER_TO_MS_UNIT);
     }
     return (status);
 }
@@ -6787,7 +6787,7 @@ void csrScanResultAgingTimerHandler(void *pv)
         }
         csrLLUnlock(&pMac->scan.scanResultList);
     }
-    vos_timer_start(&pMac->scan.hTimerResultAging, CSR_SCAN_RESULT_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
+    vos_timer_start(&pMac->scan.hTimerResultAging, CSR_SCAN_RESULT_AGING_INTERVAL/VOS_TIMER_TO_MS_UNIT);
 }
 
 static void csrScanResultCfgAgingTimerHandler(void *pv)
@@ -6812,7 +6812,7 @@ static void csrScanResultCfgAgingTimerHandler(void *pv)
         pEntry = tmpEntry;
     }
     csrLLUnlock(&pMac->scan.scanResultList);
-    vos_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL/PAL_TIMER_TO_MS_UNIT);
+    vos_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL/VOS_TIMER_TO_MS_UNIT);
 }
 
 eHalStatus csrScanStartIdleScanTimer(tpAniSirGlobal pMac, tANI_U32 interval)
@@ -6824,7 +6824,7 @@ eHalStatus csrScanStartIdleScanTimer(tpAniSirGlobal pMac, tANI_U32 interval)
     {
         pMac->scan.nIdleScanTimeGap += interval;
         vos_timer_stop(&pMac->scan.hTimerIdleScan);
-        status = vos_timer_start(&pMac->scan.hTimerIdleScan, interval/PAL_TIMER_TO_MS_UNIT);
+        status = vos_timer_start(&pMac->scan.hTimerIdleScan, interval/VOS_TIMER_TO_MS_UNIT);
         if( !HAL_STATUS_SUCCESS(status) )
         {
             smsLog(pMac, LOGE, "  Fail to start Idle scan timer. status = %d interval = %d", status, interval);
@@ -6963,7 +6963,9 @@ eHalStatus csrScanTriggerIdleScan(tpAniSirGlobal pMac, tANI_U32 *pTimeInterval)
             *pTimeInterval = pMac->roam.configParam.impsSleepTime;
         }
         //pmcRequestImps take a period in millisecond unit.
-        status = pmcRequestImps(pMac, pMac->roam.configParam.impsSleepTime / PAL_TIMER_TO_MS_UNIT, csrScanIMPSCallback, pMac);
+        status = pmcRequestImps(pMac,
+                   pMac->roam.configParam.impsSleepTime / VOS_TIMER_TO_MS_UNIT,
+                   csrScanIMPSCallback, pMac);
         if(!HAL_STATUS_SUCCESS(status))
         {
             if(eHAL_STATUS_PMC_ALREADY_IN_IMPS != status)
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 585f9da694be..ef3c2557f9ae 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -75,16 +75,16 @@
 #define CSR_AGING_COUNT     3
 //The following defines are used by palTimer
 //This is used for palTimer when request to imps fails
-#define CSR_IDLE_SCAN_WAIT_TIME     (1 * PAL_TIMER_TO_SEC_UNIT)     //1 second
+#define CSR_IDLE_SCAN_WAIT_TIME     (1 * VOS_TIMER_TO_SEC_UNIT)     //1 second
 //This is used for palTimer when imps ps is disabled
 //This number shall not be smaller than 5-6 seconds in general because a full scan may take 3-4 seconds
-#define CSR_IDLE_SCAN_NO_PS_INTERVAL     (10 * PAL_TIMER_TO_SEC_UNIT)     //10 second
-#define CSR_IDLE_SCAN_NO_PS_INTERVAL_MIN (5 * PAL_TIMER_TO_SEC_UNIT)
-#define CSR_SCAN_GET_RESULT_INTERVAL    (5 * PAL_TIMER_TO_SEC_UNIT)     //5 seconds
-#define CSR_MIC_ERROR_TIMEOUT  (60 * PAL_TIMER_TO_SEC_UNIT)     //60 seconds
-#define CSR_TKIP_COUNTER_MEASURE_TIMEOUT  (60 * PAL_TIMER_TO_SEC_UNIT)     //60 seconds
-#define CSR_SCAN_RESULT_AGING_INTERVAL    (5 * PAL_TIMER_TO_SEC_UNIT)     //5 seconds
-#define CSR_SCAN_RESULT_CFG_AGING_INTERVAL    (PAL_TIMER_TO_SEC_UNIT)     // 1  second
+#define CSR_IDLE_SCAN_NO_PS_INTERVAL     (10 * VOS_TIMER_TO_SEC_UNIT)     //10 second
+#define CSR_IDLE_SCAN_NO_PS_INTERVAL_MIN (5 * VOS_TIMER_TO_SEC_UNIT)
+#define CSR_SCAN_GET_RESULT_INTERVAL    (5 * VOS_TIMER_TO_SEC_UNIT)     //5 seconds
+#define CSR_MIC_ERROR_TIMEOUT  (60 * VOS_TIMER_TO_SEC_UNIT)     //60 seconds
+#define CSR_TKIP_COUNTER_MEASURE_TIMEOUT  (60 * VOS_TIMER_TO_SEC_UNIT)     //60 seconds
+#define CSR_SCAN_RESULT_AGING_INTERVAL    (5 * VOS_TIMER_TO_SEC_UNIT)     //5 seconds
+#define CSR_SCAN_RESULT_CFG_AGING_INTERVAL    (VOS_TIMER_TO_SEC_UNIT)     // 1  second
 //the following defines are NOT used by palTimer
 #define CSR_SCAN_AGING_TIME_NOT_CONNECT_NO_PS 50     //50 seconds
 #define CSR_SCAN_AGING_TIME_NOT_CONNECT_W_PS 300     //300 seconds
@@ -108,7 +108,7 @@
 
 #ifdef FEATURE_WLAN_BTAMP_UT_RF
 #define CSR_JOIN_MAX_RETRY_COUNT             10
-#define CSR_JOIN_RETRY_TIMEOUT_PERIOD        ( 1 *  PAL_TIMER_TO_SEC_UNIT )  // 1 second
+#define CSR_JOIN_RETRY_TIMEOUT_PERIOD        ( 1 *  VOS_TIMER_TO_SEC_UNIT )  // 1 second
 #endif
 
 #define CSR_ROAMING_DFS_CHANNEL_DISABLED           (0)
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index f750529a551b..2af386a039bb 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -2406,7 +2406,7 @@ static VOS_STATUS csrNeighborRoamHandleEmptyScanResult(tpAniSirGlobal pMac,
             else
             {
                 smsLog(pMac, LOG2, FL("Neighbor results refresh timer started (%d ms)"),
-                        (pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod * PAL_TIMER_TO_MS_UNIT));
+                        (pNeighborRoamInfo->cfgParams.neighborResultsRefreshPeriod * VOS_TIMER_TO_MS_UNIT));
             }
         }
     }
@@ -3767,8 +3767,6 @@ void csrNeighborRoamRRMNeighborReportResult(void *context, VOS_STATUS vosStatus)
                 pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
 
                 /* 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 = vos_timer_start(&pNeighborRoamInfo->neighborScanTimer,
                                 pNeighborRoamInfo->cfgParams.neighborScanPeriod);
                 if (eHAL_STATUS_SUCCESS != status)
@@ -4316,8 +4314,6 @@ VOS_STATUS csrNeighborRoamTransitToCFGChanScan(tpAniSirGlobal pMac,
     pNeighborRoamInfo->scanRequestTimeStamp = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd);
 
     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 = vos_timer_start(&pNeighborRoamInfo->neighborScanTimer,
                     pNeighborRoamInfo->cfgParams.neighborScanPeriod);
 
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index 50bc4c9e45aa..3633b543e402 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -37,7 +37,6 @@
 
 #include "palTypes.h"
 #include "aniGlobal.h"
-#include "palTimer.h"
 #include "csrLinkList.h"
 #include "smsDebug.h"
 #include "pmcApi.h"
diff --git a/CORE/SYS/legacy/src/pal/inc/palTimer.h b/CORE/SYS/legacy/src/pal/inc/palTimer.h
deleted file mode 100644
index eee07a894a0b..000000000000
--- a/CORE/SYS/legacy/src/pal/inc/palTimer.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2011-2012 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-
-/** ------------------------------------------------------------------------- *
-    ------------------------------------------------------------------------- *
-
-
-    \file palTimer.h
-
-    \brief Define data structure and ptototype for PAL timer.
-
-    $Id$... description...
-
-   ========================================================================== */
-
-#if !defined( PALTIMER_H__ )
-#define PALTIMER_H__
-
-
-/*
-PAL TIMER
-  This timer can be used for every module in Windows side.
-  On Linus side, this can only be used by timer for HDD. Not for timers used in rtlib, hence it doesn't replace TX_TIMER
-*/
-
-typedef void * tPalTimerHandle;
-
-#define PAL_INVALID_TIMER_HANDLE (NULL)
-
-typedef void (*palTimerCallback)(void *);
-
-#define PAL_TIMER_TO_MS_UNIT      1000
-#define PAL_TIMER_TO_SEC_UNIT     1000000
-
-#ifndef FEATURE_WLAN_PAL_TIMER_DISABLE
-//PAL timer functions
-//pPalTimer is a pointer to a caller allocated tPalTimer object
-//pContext is a pointer to an object that will be passed in when callback is called
-//fRestart to set whether the timer is restart after callback returns
-#ifdef TIMER_MANAGER
-#define palTimerAlloc(hHdd, phPalTimer, pCallback, pContext) \
-              palTimerAlloc_debug(hHdd, phPalTimer, pCallback, pContext, __FILE__, __LINE__)
-eHalStatus palTimerAlloc_debug( tHddHandle hHdd, tPalTimerHandle *phPalTimer,
-                          palTimerCallback pCallback, void *pContext, char* fileName, v_U32_t lineNum  );
-#else
-eHalStatus palTimerAlloc(tHddHandle hHdd, tPalTimerHandle *phPalTimer, palTimerCallback pCallback, void *pContext);
-#endif
-//This function will free the timer
-//On Windows platform, it can only be called when device is unloading.
-eHalStatus palTimerFree(tHddHandle, tPalTimerHandle);
-//To start a timer
-//uExpireTime is the timer lapse before timer fires. If the timer is in running state and the fRestart is true,
-//uExpireTime is set so that it is the new interval, in units of microseconds
-eHalStatus palTimerStart(tHddHandle, tPalTimerHandle, tANI_U32 uExpireTime, tANI_BOOLEAN fRestart);
-//palTimerStop will cancel the timer but doesn't guarrantee the callback will not called afterwards
-//For Windows, if the driver is halting, the callback is not called after this function returns.
-eHalStatus palTimerStop(tHddHandle, tPalTimerHandle);
-#endif
-
-#endif
diff --git a/CORE/SYS/legacy/src/pal/src/palTimer.c b/CORE/SYS/legacy/src/pal/src/palTimer.c
deleted file mode 100644
index 41ab2d862a0f..000000000000
--- a/CORE/SYS/legacy/src/pal/src/palTimer.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2011-2013 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-/**
-
-    \file palTimer.c
-
-    \brief Implemenation of the Platform Abstracion Layer timer functions
-
-    $Id$This file contains function implementations for the Platform
-    Abstration Layer.
-
- */
-
-#include <halTypes.h>
-#include <palTimer.h>
-#include <vos_timer.h>
-#include <vos_memory.h>
-
-#ifndef FEATURE_WLAN_PAL_TIMER_DISABLE
-typedef struct sPalTimer
-{
-    palTimerCallback timerCallback;
-    void *pContext;
-    tHddHandle hHdd;         // not really needed when mapping to vos timers
-    tANI_U32 uTimerInterval; //meaningful only is fRestart is true
-    tANI_BOOLEAN fRestart;
-
-    vos_timer_t vosTimer;
-
-} tPalTimer, *tpPalTimer;
-
-v_VOID_t internalTimerCallback( v_PVOID_t userData )
-{
-    tPalTimer *pPalTimer = (tPalTimer *)userData;
-
-    if ( pPalTimer )
-    {
-        if ( pPalTimer->timerCallback )
-        {
-            pPalTimer->timerCallback( pPalTimer->pContext );
-        }
-
-        if ( pPalTimer->fRestart )
-        {
-            palTimerStart( pPalTimer->hHdd, pPalTimer, pPalTimer->uTimerInterval, eANI_BOOLEAN_TRUE );
-        }
-    }
-}
-
-#ifdef TIMER_MANAGER
-eHalStatus palTimerAlloc_debug( tHddHandle hHdd, tPalTimerHandle *phPalTimer,
-                          palTimerCallback pCallback, void *pContext, char* fileName, v_U32_t lineNum  )
-{
-   eHalStatus halStatus = eHAL_STATUS_FAILURE;
-   tPalTimer *pPalTimer = NULL;
-   VOS_STATUS vosStatus;
-
-   do
-   {
-      // allocate the internal timer structure.
-      pPalTimer = vos_mem_malloc( sizeof( tPalTimer ) );
-      if ( NULL == pPalTimer ) break;
-
-      // initialize the vos Timer that underlies the pal Timer.
-      vosStatus = vos_timer_init_debug( &pPalTimer->vosTimer, VOS_TIMER_TYPE_SW,
-                                   internalTimerCallback, pPalTimer, fileName, lineNum );
-      if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
-      {
-         // if fail to init the vos timer, free the memory and bail out.
-         vos_mem_free( pPalTimer );
-         break;
-      }
-
-      // initialize the info in the internal palTimer struct so we can
-      pPalTimer->timerCallback = pCallback;
-      pPalTimer->pContext      = pContext;
-      pPalTimer->hHdd          = hHdd;
-
-      // return a 'handle' to the caller.
-      *phPalTimer = pPalTimer;
-
-      halStatus = eHAL_STATUS_SUCCESS;
-
-   } while( 0 );
-
-    return( halStatus );
-}
-#else
-eHalStatus palTimerAlloc( tHddHandle hHdd, tPalTimerHandle *phPalTimer,
-                          palTimerCallback pCallback, void *pContext )
-{
-   eHalStatus halStatus = eHAL_STATUS_FAILURE;
-   tPalTimer *pPalTimer = NULL;
-   VOS_STATUS vosStatus;
-
-   do
-   {
-      // allocate the internal timer structure.
-      pPalTimer = vos_mem_malloc( sizeof( tPalTimer ) );
-      if ( NULL == pPalTimer ) break;
-
-      // initialize the vos Timer that underlies the pal Timer.
-      vosStatus = vos_timer_init( &pPalTimer->vosTimer, VOS_TIMER_TYPE_SW,
-                                   internalTimerCallback, pPalTimer );
-      if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
-      {
-         // if fail to init the vos timer, free the memory and bail out.
-         vos_mem_free( pPalTimer );
-         break;
-      }
-
-      // initialize the info in the internal palTimer struct so we can
-      pPalTimer->timerCallback = pCallback;
-      pPalTimer->pContext      = pContext;
-      pPalTimer->hHdd          = hHdd;
-
-      // return a 'handle' to the caller.
-      *phPalTimer = pPalTimer;
-
-      halStatus = eHAL_STATUS_SUCCESS;
-
-   } while( 0 );
-
-    return( halStatus );
-}
-#endif
-
-
-eHalStatus palTimerFree( tHddHandle hHdd, tPalTimerHandle hPalTimer )
-{
-   eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
-   VOS_STATUS vosStatus;
-   tPalTimer *pPalTimer = (tPalTimer *)hPalTimer;
-
-   do
-   {
-      if ( NULL == pPalTimer ) break;
-
-      // Destroy the vos timer...
-      vosStatus = vos_timer_destroy( &pPalTimer->vosTimer );
-      if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) ) break;
-
-      // Free the memory for the intrnal timer struct...
-      vos_mem_free( pPalTimer );
-
-      status = eHAL_STATUS_SUCCESS;
-
-   } while( 0 );
-
-   return( status );
-}
-
-
-eHalStatus palTimerStart(tHddHandle hHdd, tPalTimerHandle hPalTimer, tANI_U32 uExpireTime, tANI_BOOLEAN fRestart)
-{
-   eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
-   VOS_STATUS vosStatus;
-   tANI_U32 expireTimeInMS = 0;
-
-   tPalTimer *pPalTimer = (tPalTimer *)hPalTimer;
-
-   do
-   {
-      if ( NULL == pPalTimer ) break;
-
-      pPalTimer->fRestart = fRestart;
-      pPalTimer->uTimerInterval = uExpireTime;
-
-      // vos Timer takes expiration time in milliseconds.  palTimerStart and
-      // the uTimerIntervl in tPalTimer struct have expiration tiem in
-      // microseconds.  Make and adjustment from microseconds to milliseconds
-      // before calling the vos_timer_start().
-      expireTimeInMS = uExpireTime / 1000;
-      vosStatus = vos_timer_start( &pPalTimer->vosTimer, expireTimeInMS );
-      if ( !VOS_IS_STATUS_SUCCESS( vosStatus ) )
-      {
-         status = eHAL_STATUS_FAILURE;
-         break;
-      }
-
-      status = eHAL_STATUS_SUCCESS;
-
-   } while( 0 );
-
-   return( status );
-}
-
-
-eHalStatus palTimerStop(tHddHandle hHdd, tPalTimerHandle hPalTimer)
-{
-   eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
-
-   tPalTimer *pPalTimer = (tPalTimer *)hPalTimer;
-
-   do
-   {
-      if ( NULL == pPalTimer ) break;
-
-      vos_timer_stop( &pPalTimer->vosTimer );
-
-      // make sure the timer is not re-started.
-      pPalTimer->fRestart = eANI_BOOLEAN_FALSE;
-
-      status = eHAL_STATUS_SUCCESS;
-
-   } while( 0 );
-
-   return( status );
-}
-
-#endif
diff --git a/CORE/VOSS/inc/vos_timer.h b/CORE/VOSS/inc/vos_timer.h
index 98ee433f998b..96ecfd1934f9 100644
--- a/CORE/VOSS/inc/vos_timer.h
+++ b/CORE/VOSS/inc/vos_timer.h
@@ -56,6 +56,8 @@
   Preprocessor definitions and constants
   ------------------------------------------------------------------------*/
 #define VOS_TIMER_STATE_COOKIE 0x12
+#define VOS_TIMER_TO_MS_UNIT   1000
+#define VOS_TIMER_TO_SEC_UNIT  1000000
 
 /*--------------------------------------------------------------------------
   Type declarations
diff --git a/Kbuild b/Kbuild
index 1ac71a79b6bd..f7c2c0d74716 100644
--- a/Kbuild
+++ b/Kbuild
@@ -639,7 +639,6 @@ SYS_COMMON_SRC_DIR := $(SYS_DIR)/common/src
 SYS_LEGACY_SRC_DIR := $(SYS_DIR)/legacy/src
 SYS_OBJS :=	$(SYS_COMMON_SRC_DIR)/wlan_qct_sys.o \
 		$(SYS_LEGACY_SRC_DIR)/pal/src/palApiComm.o \
-		$(SYS_LEGACY_SRC_DIR)/pal/src/palTimer.o \
 		$(SYS_LEGACY_SRC_DIR)/platform/src/VossWrapper.o \
 		$(SYS_LEGACY_SRC_DIR)/system/src/macInitApi.o \
 		$(SYS_LEGACY_SRC_DIR)/system/src/sysEntryFunc.o \