qcacld: vos_atomic_set 64-Bit Clean.

vos_atomic_set_U32 is used to set the U32 variable atomically,
but for 64-bit we need a different API which can support for
both 32/64 bit.

Change-Id: I7e15070c63471759f0a6e767633f447b2a0a1d7d
CRs-Fixed: 643325

4 files changed, 25 insertions, 25 deletions

diff --git a/CORE/HDD/src/bap_hdd_main.c b/CORE/HDD/src/bap_hdd_main.c
index 9d2f08ba87a3..9af213469ba7 100644
--- a/CORE/HDD/src/bap_hdd_main.c
+++ b/CORE/HDD/src/bap_hdd_main.c
@@ -769,7 +769,7 @@ static void BslReleasePhyCtx
     BslPhyLinkCtxType* pPhyCtx
 )
 {
-    v_U32_t OldMapVal;
+    uintptr_t OldMapVal;
     VOS_STATUS VosStatus = VOS_STATUS_SUCCESS;
 
     VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslReleasePhyCtx\n" );
@@ -781,8 +781,8 @@ static void BslReleasePhyCtx
 
 
     // update the phy link handle based map so TX data is stopped from flowing through
-    OldMapVal = vos_atomic_set_U32( (v_U32_t *) (BslPhyLinkMap[pPhyCtx->PhyLinkHdl].ptr),
-                                    (v_U32_t) 0 );
+    OldMapVal = vos_atomic_set( (uintptr_t *) (BslPhyLinkMap[pPhyCtx->PhyLinkHdl].ptr),
+                                    (uintptr_t) 0 );
 
     // clear out the Tx Queues
     VosStatus =  BslFlushTxQueues(pPhyCtx);
@@ -1212,8 +1212,8 @@ static VOS_STATUS WLANBAP_EventCB
             else
             {
                 // update the phy link handle based map so TX data can start flowing through
-                OldMapVal = vos_atomic_set_U32( (v_U32_t *)BslPhyLinkMap+pBapHCIEvent->u.btampPhysicalLinkCompleteEvent.phy_link_handle,
-                                                (v_U32_t) pHddHdl );
+                OldMapVal = vos_atomic_set( (uintptr_t*)BslPhyLinkMap+pBapHCIEvent->u.btampPhysicalLinkCompleteEvent.phy_link_handle,
+                                                (uintptr_t) pHddHdl );
 
 //                  VOS_ASSERT( OldMapVal == 0 );//Commented to test reconnect
             }
@@ -1228,8 +1228,8 @@ static VOS_STATUS WLANBAP_EventCB
         {
             //We need to update the phy link handle here to be able to reissue physical link accept
             // update the phy link handle based map so TX data can start flowing through
-            OldMapVal = vos_atomic_set_U32( (v_U32_t *)BslPhyLinkMap+pBapHCIEvent->u.btampPhysicalLinkCompleteEvent.phy_link_handle,
-                                            (v_U32_t) pHddHdl );
+            OldMapVal = vos_atomic_set( (uintptr_t*)BslPhyLinkMap+pBapHCIEvent->u.btampPhysicalLinkCompleteEvent.phy_link_handle,
+                                            (uintptr_t) pHddHdl );
 
 //                  VOS_ASSERT( OldMapVal == 0 );//Commented to test reconnect
 
@@ -1240,8 +1240,8 @@ static VOS_STATUS WLANBAP_EventCB
         {
             //We need to update the phy link handle here to be able to reissue physical link /create/accept
             // update the phy link handle based map so TX data can start flowing through
-            OldMapVal = vos_atomic_set_U32( (v_U32_t *)BslPhyLinkMap+pBapHCIEvent->u.btampPhysicalLinkCompleteEvent.phy_link_handle,
-                                            (v_U32_t) pHddHdl );
+            OldMapVal = vos_atomic_set( (uintptr_t*)BslPhyLinkMap+pBapHCIEvent->u.btampPhysicalLinkCompleteEvent.phy_link_handle,
+                                            (uintptr_t) pHddHdl );
 //                  VOS_ASSERT( OldMapVal == 0 );//Commented to test reconnect
 
             BslReleasePhyCtx( (BslPhyLinkCtxType *)pHddHdl );
diff --git a/CORE/VOSS/inc/vos_types.h b/CORE/VOSS/inc/vos_types.h
index 99a22f7bd7f2..c30bf5081e85 100644
--- a/CORE/VOSS/inc/vos_types.h
+++ b/CORE/VOSS/inc/vos_types.h
@@ -414,19 +414,19 @@ VOS_INLINE_FN v_VOID_t vos_set_macaddr_broadcast( v_MACADDR_t *pMacAddr )
 
 /*----------------------------------------------------------------------------
 
-  \brief vos_atomic_set_U32() - set a U32 variable atomically
+  \brief vos_atomic_set() - set a variable atomically
 
-  \param pTarget - pointer to the v_U32_t to set.
+  \param pTarget - pointer to the variable to set.
 
-  \param value - the value to set in the v_U32_t variable.
+  \param value - the value to set in the  variable.
 
-  \return This function returns the value previously in the v_U32_t before
+  \return This function returns the value previously in the uintptr_t before
           the new value is set.
 
   \sa vos_atomic_increment_U32(), vos_atomic_decrement_U32()
 
   --------------------------------------------------------------------------*/
-v_U32_t vos_atomic_set_U32( v_U32_t *pTarget, v_U32_t value );
+uintptr_t vos_atomic_set( uintptr_t *pTarget, uintptr_t value );
 
 
 // TODO: the below function is a stub to perform atomic set on a BYTE
diff --git a/CORE/VOSS/src/vos_types.c b/CORE/VOSS/src/vos_types.c
index 1dddbf09f1e7..b7182162ba11 100644
--- a/CORE/VOSS/src/vos_types.c
+++ b/CORE/VOSS/src/vos_types.c
@@ -56,21 +56,21 @@
 
 /*----------------------------------------------------------------------------
 
-  \brief vos_atomic_set_U32() - set a U32 variable atomically
+  \brief vos_atomic_set - set a variable atomically
 
-  \param pTarget - pointer to the v_U32_t to set.
+  \param pTarget - pointer to the uintptr_t to set.
 
-  \param value - the value to set in the v_U32_t variable.
+  \param value - the value to set in the uintptr_t variable.
 
-  \return This function returns the value previously in the v_U32_t before
+  \return This function returns the value previously in the uintptr_t before
           the new value is set.
 
   \sa vos_atomic_increment_U32(), vos_atomic_decrement_U32()
 
   --------------------------------------------------------------------------*/
-v_U32_t vos_atomic_set_U32( v_U32_t *pTarget, v_U32_t value )
+uintptr_t vos_atomic_set( uintptr_t *pTarget, uintptr_t value )
 {
-  v_U32_t oldval;
+  uintptr_t oldval;
   unsigned long flags;
 
   if (pTarget == NULL)
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index b5ec5ec942ce..7be41edb3424 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -11015,7 +11015,7 @@ VOS_STATUS WDA_TxComplete( v_PVOID_t pVosContext, vos_pkt_t *pData,
    if( NULL!=wdaContext->pTxCbFunc)
    {
       /*check if packet is freed already*/
-      if(vos_atomic_set_U32(&wdaContext->VosPacketToFree, (v_U32_t)WDA_TX_PACKET_FREED) == (v_U32_t)pData)
+      if(vos_atomic_set((uintptr_t*)&wdaContext->VosPacketToFree, (uintptr_t)WDA_TX_PACKET_FREED) == (uintptr_t)pData)
       {
          wdaContext->pTxCbFunc(pMac, pData, 1);
       }
@@ -11188,7 +11188,7 @@ VOS_STATUS WDA_TxPacket(void *pWDA_handle,
           txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
        }
    }
-   vos_atomic_set_U32(&pWDA->VosPacketToFree, (v_U32_t)pFrmBuf);/*set VosPacket_freed to pFrmBuf*/
+   vos_atomic_set((uintptr_t*)&pWDA->VosPacketToFree, (uintptr_t)pFrmBuf);/*set VosPacket_freed to pFrmBuf*/
 
    /*Set frame tag to 0
      We will use the WDA user data in order to tag a frame as expired*/
@@ -11203,7 +11203,7 @@ VOS_STATUS WDA_TxPacket(void *pWDA_handle,
       VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
                        "Sending Mgmt Frame failed - status = %d", status);
       pCompFunc(VOS_GET_MAC_CTXT(pWDA->pVosContext), (vos_pkt_t *)pFrmBuf, 1);
-      vos_atomic_set_U32(&pWDA->VosPacketToFree, (v_U32_t)WDA_TX_PACKET_FREED);/*reset the VosPacket_freed*/
+      vos_atomic_set((uintptr_t*)&pWDA->VosPacketToFree, (v_U32_t)WDA_TX_PACKET_FREED);/*reset the VosPacket_freed*/
       if( pAckTxComp )
       {
          pWDA->pAckTxCbFunc = NULL;
@@ -11240,8 +11240,8 @@ VOS_STATUS WDA_TxPacket(void *pWDA_handle,
       /* check whether the packet was freed already,so need not free again when
       * TL calls the WDA_Txcomplete routine
       */
-      vos_atomic_set_U32(&pWDA->VosPacketToFree, (v_U32_t)WDA_TX_PACKET_FREED);
-      /*if(vos_atomic_set_U32(&pWDA->VosPacketToFree, (v_U32_t)WDA_TX_PACKET_FREED) == (v_U32_t)pFrmBuf)
+      vos_atomic_set((uintptr_t*)&pWDA->VosPacketToFree, (uintptr_t)WDA_TX_PACKET_FREED);
+      /*if(vos_atomic_set(uintptr_t *)&pWDA->VosPacketToFree, (uintptr_t)WDA_TX_PACKET_FREED) == (v_U32_t)pFrmBuf)
       {
          pCompFunc(VOS_GET_MAC_CTXT(pWDA->pVosContext), (vos_pkt_t *)pFrmBuf);
       } */