diff options
| author | Sanjay Devnani <sdevnani@qca.qualcomm.com> | 2014-01-20 16:28:09 -0800 |
|---|---|---|
| committer | Prakash Dhavali <pdhavali@qca.qualcomm.com> | 2014-01-28 00:00:54 -0800 |
| commit | e38766814d67421ab909026a4e586fc2bb68918c (patch) | |
| tree | fbd0374f3d79ef8d3571ee9b3afe884aec266bb8 | |
| parent | b71c1e9e02e5301707f21e0a1acb2f838776d575 (diff) | |
wlan: making SYS_MSG_ID_MC_STOP messaging 64-bit clean
Changing the 32bit pointer to a more generic - void *.
This will help compile without warnings for both 64bit and
32 bit architectures. Also, modifying vos message to use
the new callback field.
Change-Id: Iae5155dc2ccb558c4713149581b7d7d23dbaea03
CRs-fixed: 582166
| -rw-r--r-- | CORE/SYS/common/src/wlan_qct_sys.c | 9 | ||||
| -rw-r--r-- | CORE/TL/src/wlan_qct_tl.c | 4 | ||||
| -rw-r--r-- | CORE/WDA/src/wlan_qct_wda_ds.c | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/CORE/SYS/common/src/wlan_qct_sys.c b/CORE/SYS/common/src/wlan_qct_sys.c index ff5a8bec0e37..d27f9c5050f3 100644 --- a/CORE/SYS/common/src/wlan_qct_sys.c +++ b/CORE/SYS/common/src/wlan_qct_sys.c @@ -146,11 +146,10 @@ VOS_STATUS sysStop( v_CONTEXT_t pVosContext ) /* post a message to SYS module in MC to stop SME and MAC */ sysBuildMessageHeader( SYS_MSG_ID_MC_STOP, &sysMsg ); - // Save the user callback and user data to callback in the body pointer - // and body data portion of the message. + // Save the user callback and user data // finished. - sysMsg.bodyptr = (void *)sysStopCompleteCb; - sysMsg.bodyval = (v_U32_t) &gStopEvt; + sysMsg.callback = sysStopCompleteCb; + sysMsg.bodyptr = (void *) &gStopEvt; // post the message.. vosStatus = vos_mq_post_message( VOS_MQ_ID_SYS, &sysMsg ); @@ -361,7 +360,7 @@ VOS_STATUS sysMcProcessMsg( v_CONTEXT_t pVosContext, vos_msg_t *pMsg ) vosStatus = macStop( hHal, HAL_STOP_TYPE_SYS_DEEP_SLEEP ); VOS_ASSERT( VOS_IS_STATUS_SUCCESS( vosStatus ) ); - ((sysResponseCback)pMsg->bodyptr)((v_VOID_t *)pMsg->bodyval); + ((sysResponseCback)pMsg->callback)((v_VOID_t *)pMsg->bodyptr); vosStatus = VOS_STATUS_SUCCESS; } diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c index 5e90b7593a6b..6e0359410256 100644 --- a/CORE/TL/src/wlan_qct_tl.c +++ b/CORE/TL/src/wlan_qct_tl.c @@ -8727,8 +8727,8 @@ WLANTL_TxProcessMsg break; case WDA_DS_FINISH_ULA: - callbackContext = (void *)message->bodyval; - callbackRoutine = message->bodyptr; + callbackRoutine = message->callback; + callbackContext = message->bodyptr; callbackRoutine(callbackContext); break; diff --git a/CORE/WDA/src/wlan_qct_wda_ds.c b/CORE/WDA/src/wlan_qct_wda_ds.c index 6b736277ddf3..b6e8117d3933 100644 --- a/CORE/WDA/src/wlan_qct_wda_ds.c +++ b/CORE/WDA/src/wlan_qct_wda_ds.c @@ -353,8 +353,8 @@ WDA_DS_FinishULA vos_mem_zero( &sMessage, sizeof(vos_msg_t) ); - sMessage.bodyval = (v_U32_t)callbackContext; - sMessage.bodyptr = callbackRoutine; + sMessage.callback = callbackRoutine; + sMessage.bodyptr = callbackContext; sMessage.type = WDA_DS_FINISH_ULA; return vos_tx_mq_serialize(VOS_MQ_ID_TL, &sMessage); |