commit 3c5b0636854eed6089c13be01c57427e9710bc5f
author Gopichand Nakkala <gnakkala@qca.qualcomm.com> Sun Dec 23 08:30:59 2012 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Wed Jan 09 10:58:07 2013 -0800
tree 42234795aa3894bd0cbd5e2830265e6ae7c45c6f
parent 0b71445bb98c3b5d2bf4108452c33b4ecfb1a33d

wlan: Code cleanup

Cleanup code by not directly calling VOS routines from WDI. WPAL routine
created for use by WDI. This is to cleanup changes done in earlier CL
664207.

Change-Id: Ic4590434568d39a9215d5974e4242c1231fa6043
CR-Fixed: 433295

CORE/WDI/CP/src/wlan_qct_wdi.c

diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index a6705b0..a4b6b04 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -83,7 +83,6 @@
 /*----------------------------------------------------------------------------
  * Include Files
  * -------------------------------------------------------------------------*/
-#include <vos_trace.h>
 #include "wlan_qct_wdi.h"
 #include "wlan_qct_wdi_i.h"
 #include "wlan_qct_wdi_sta.h"
@@ -19436,7 +19435,7 @@
                   "response %s (%d)",
                   WDI_getRespMsgString(pWDICtx->wdiExpectedResponse),
                   pWDICtx->wdiExpectedResponse);
-       VOS_ASSERT(0);
+       WDI_ASSERT(0);
      }
    }
 
@@ -19465,7 +19464,7 @@
    wpalTimerStart(&pWDICtx->wptResponseTimer, WDI_RESPONSE_TIMEOUT);
 
    /*cache current timestamp for debugging */
-   pWDICtx->uTimeStampRspTmrStart = vos_timer_get_system_time();
+   pWDICtx->uTimeStampRspTmrStart = wpalGetSystemTime();
   }
   else
   {
@@ -19625,7 +19624,7 @@
   }
 
   /*cache current timestamp for debugging */
-  pWDICtx->uTimeStampRspTmrExp = vos_timer_get_system_time();
+  pWDICtx->uTimeStampRspTmrExp = wpalGetSystemTime();
 
   /* If response timer is running at this time that means this timer
    * event is not for the last request but rather last-to-last request and

CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h

diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h
index b671da9..0e31407 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h
@@ -61,6 +61,8 @@
 #include "wlan_qct_os_timer.h"
 
 
+typedef VOS_TIMER_STATE WPAL_TIMER_STATE;
+
 typedef void (*wpal_timer_callback)(void *pUserData);
 
 typedef struct
@@ -116,9 +118,17 @@
     pTimer - a pointer to caller allocated wpt_timer object
 
     return
-        VOS_TIMER_STATE
+        WPAL_TIMER_STATE
 ---------------------------------------------------------------------------*/
-VOS_TIMER_STATE wpalTimerGetCurStatus(wpt_timer * pTimer);
+WPAL_TIMER_STATE wpalTimerGetCurStatus(wpt_timer * pTimer);
+
+/*---------------------------------------------------------------------------
+    wpalGetSystemTime - Get the system time in milliseconds
+
+    return
+        current time in milliseconds
+---------------------------------------------------------------------------*/
+wpt_uint32 wpalGetSystemTime(void);
 
 /*---------------------------------------------------------------------------
     wpalSleep - sleep for a specified interval

CORE/WDI/WPAL/src/wlan_qct_pal_timer.c

diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c b/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
index 4e7bc8d..bd5decf 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
@@ -194,7 +194,7 @@
     \return
         VOS_TIMER_STATE
 ---------------------------------------------------------------------------*/
-VOS_TIMER_STATE wpalTimerGetCurStatus(wpt_timer * pTimer)
+WPAL_TIMER_STATE wpalTimerGetCurStatus(wpt_timer * pTimer)
 {
    /* Sanity Checks */
    if( pTimer == NULL )
@@ -204,7 +204,18 @@
       return eWLAN_PAL_STATUS_E_INVAL;
    }
    return vos_timer_getCurrentState( &pTimer->timer.timerObj );
-}/*wpalTimerStop*/
+}/*wpalTimerGetCurStatus*/
+
+/*---------------------------------------------------------------------------
+    \brief wpalGetSystemTime - Get the system time in milliseconds
+
+    \return
+        current time in milliseconds
+---------------------------------------------------------------------------*/
+wpt_uint32 wpalGetSystemTime(void)
+{
+   return vos_timer_get_system_time();
+}/*wpalGetSystemTime*/
 
 /*---------------------------------------------------------------------------
     wpalSleep - sleep for a specified interval