wlan: wda: remove obsolete "INTEGRATED_SOC" featurization
The current driver is designed around an "integrated SoC" solution
where the WLAN processor and the Application Processor are integrated.
But the driver is based upon a prior driver that supported a
non-integrated discrete solution. During the time the driver was
converted from a non-integrate to integrated solution conditional
compilation was introduced so that both architectures could be
supported by the same driver. But the non-integrated solution is no
longer supported by this driver, so remove all of the conditional
compilation so that the current driver will be easier to support.
Change-Id: Ia04abc690f8a5d50303b866ae5de5d1a50d70e0a
CRs-fixed: 452041
diff --git a/CORE/WDA/inc/legacy/halMsgApi.h b/CORE/WDA/inc/legacy/halMsgApi.h
index 599a840..c6fdf4a 100644
--- a/CORE/WDA/inc/legacy/halMsgApi.h
+++ b/CORE/WDA/inc/legacy/halMsgApi.h
@@ -47,10 +47,6 @@
#include "halTypes.h"
#include "sirApi.h"
#include "sirParams.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halPhy.h"
-#include "halPhyApi.h"
-#endif
#define HAL_NUM_BSSID 2
/* operMode in ADD BSS message */
@@ -731,7 +727,6 @@
} tFinishScanParams, * tpFinishScanParams;
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#ifdef FEATURE_OEM_DATA_SUPPORT
#ifndef OEM_DATA_REQ_SIZE
@@ -753,7 +748,6 @@
tANI_U8 oemDataRsp[OEM_DATA_RSP_SIZE];
} tStartOemDataRsp, *tpStartOemDataRsp;
#endif
-#endif
typedef struct sBeaconGenStaInfo {
tANI_U16 assocId;
@@ -1369,7 +1363,6 @@
}tP2pPsParams, *tpP2pPsParams;
#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
static inline void halGetTxTSFtimer(tpAniSirGlobal pMac,
tSirMacTimeStamp *pTime)
{
@@ -1412,6 +1405,5 @@
tANI_U8 ucRemIeId[1];
} __ani_attr_packed tRemBeaconFilterMsg, *tpRemBeaconFilterMsg;
-#endif
#endif /* _HALMSGAPI_H_ */
diff --git a/CORE/WDA/inc/legacy/halTypes.h b/CORE/WDA/inc/legacy/halTypes.h
index ebf292e..f6d7b91 100644
--- a/CORE/WDA/inc/legacy/halTypes.h
+++ b/CORE/WDA/inc/legacy/halTypes.h
@@ -58,15 +58,6 @@
#ifndef HALTYPES_H
#define HALTYPES_H
#ifndef WINXP_APPS_BUILD //TODO: this header dependency does not belong in this file
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "wlan_qct_bal.h"
-
-#ifdef WLAN_HAL_VOLANS
-#include "volansDefs.h"
-#else
-#include "libraDefs.h"
-#endif
-#endif
#endif /* WINXP_APPS_BUILD */
@@ -363,7 +354,6 @@
#define offsetof(type, field) __offsetof(type, field)
#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#define HAL_MAX_TXPOWER_INVALID 127
#define MIN_STA_PWR_CAP_DBM 13
@@ -455,7 +445,6 @@
#define STACFG_MAX_TC 8
-#endif
#endif
diff --git a/CORE/WDA/inc/legacy/palTypes.h b/CORE/WDA/inc/legacy/palTypes.h
index 260fb33..d6678d8 100644
--- a/CORE/WDA/inc/legacy/palTypes.h
+++ b/CORE/WDA/inc/legacy/palTypes.h
@@ -64,9 +64,7 @@
#include "vos_api.h"
#endif /* WINXP_APPS_BUILD */
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#include "halLegacyPalTypes.h"
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
#ifndef MK_IMAGE_HDR
// values to check against for code that is Client/AP specific.
@@ -214,24 +212,6 @@
// Common type definitions...
-#ifndef FEATURE_WLAN_INTEGRATED_SOC
-typedef unsigned char tANI_U8;
-typedef signed char tANI_S8;
-
-typedef unsigned short tANI_U16;
-typedef signed short tANI_S16;
-
-typedef unsigned long tANI_U32;
-typedef signed long tANI_S32;
-
-#if defined ANI_OS_TYPE_WINDOWS
-typedef unsigned __int64 tANI_U64;
-#else
-typedef unsigned long long tANI_U64;
-#endif
-
-typedef tANI_U8 tANI_BYTE;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
#if defined( ANI_OS_TYPE_WINDOWS )
#if defined(_WIN64)
@@ -246,9 +226,6 @@
// Buffer address; could be virt or phys; could be 32- or 64-bit depending on compile option
typedef tANI_U32_OR_PTR tANI_BUFFER_ADDR;
// which boolean is the most usefule...or both ?
-#ifndef FEATURE_WLAN_INTEGRATED_SOC
-typedef tANI_U8 tANI_BOOLEAN;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
typedef enum tagAniBoolean
{
@@ -326,7 +303,4 @@
#define PAL_TICKS_PER_SECOND 100
-#ifndef FEATURE_WLAN_INTEGRATED_SOC
-typedef tANI_U32 tANI_TIMESTAMP;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
#endif
diff --git a/CORE/WDA/inc/legacy/wlan_qct_hal.h b/CORE/WDA/inc/legacy/wlan_qct_hal.h
index 4fd4a34..584e7c0 100644
--- a/CORE/WDA/inc/legacy/wlan_qct_hal.h
+++ b/CORE/WDA/inc/legacy/wlan_qct_hal.h
@@ -39,12 +39,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/*
- * Qualcomm, Inc proprietary. All rights reserved.
- *
- * Date Modified by Modification Information
- * --------------------------------------------------------------------
- */
#ifndef WLAN_QCT_HAL_H
#define WLAN_QCT_HAL_H
#include "vos_status.h"
@@ -73,9 +67,6 @@
#define eHalStatus VOS_STATUS
#endif
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halBdDefs.h"
-#endif
#define QWLAN_HAL_DXE0_MASTERID 5
typedef struct sHalBdGeneric {
@@ -180,14 +171,9 @@
#define WLANHAL_RX_BD_ADDR3_SELF_IDX 0
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
// Should not use tHalTxBd nor tHalRxBd. UMAC doesn't know these HAL structure.
#define WLANHAL_TX_BD_HEADER_SIZE 40
#define WLANHAL_RX_BD_HEADER_SIZE 76
-#else
-#define WLANHAL_TX_BD_HEADER_SIZE sizeof(tHalTxBd)
-#define WLANHAL_RX_BD_HEADER_SIZE sizeof(tHalRxBd)
-#endif
#define WLANHAL_RX_BD_HEADER_OFFSET 0
@@ -324,23 +310,11 @@
#define WLANHAL_RX_BD_FT_DONE 1 /* The value of the field when frame xtl was done*/
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-//Check whether a RX frame is unprotected over the air
-#if defined(LIBRA_WAPI_SUPPORT)
-#define WLANHAL_RX_IS_UNPROTECTED_WPI_FRAME(_pvBDHeader) \
- (((tpHalRxBd)_pvBDHeader)->uef)
-
-#else
-#define WLANHAL_RX_IS_UNPROTECTED_WPI_FRAME(_pvBDHeader) \
- (DPU_FEEDBACK_WPI_UNPROTECTED == ((tpHalRxBd)_pvBDHeader)->dpuFeedback)
-#endif
-#else
/*DPU_FEEDBACK_WPI_UNPROTECTED macro defined in volansdefs.h which is not available
for UMAC in prima so declared it here */
#define DPU_FEEDBACK_WPI_UNPROTECTED 0x20
#define WLANHAL_RX_IS_UNPROTECTED_WPI_FRAME(_pvBDHeader) \
(DPU_FEEDBACK_WPI_UNPROTECTED == ((WDI_RxBdType *)_pvBDHeader)->dpuFeedback)
-#endif
/*==========================================================================
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index c681692..2fd5038 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -44,21 +44,19 @@
/*===========================================================================
- W L A N DEVICE ADAPTATION L A Y E R
+ W L A N DEVICE ADAPTATION L A Y E R
E X T E R N A L A P I
-
-
+
+
DESCRIPTION
This file contains the external API exposed by the wlan adaptation layer for Prima
and Volans.
For Volans this layer is actually a thin layer that maps all WDA messages and
functions to equivalent HAL messages and functions. The reason this layer was introduced
- was to keep the UMAC identical across Prima and Volans. This layer provides the glue
+ was to keep the UMAC identical across Prima and Volans. This layer provides the glue
between SME, PE , TL and HAL.
- Copyright (c) 2008 QUALCOMM Incorporated. All Rights Reserved.
- Qualcomm Confidential and Proprietary
===========================================================================*/
@@ -80,26 +78,14 @@
01/27/2011 rnair Adding WDA support for Volans.
12/08/2010 seokyoun Move down HAL interfaces from TL to WDA
for UMAC convergence btween Volans/Libra and Prima
-08/25/2010 adwivedi WDA Context and exposed API's
+08/25/2010 adwivedi WDA Context and exposed API's
=========================================================================== */
#include "aniGlobal.h"
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# include "wlan_qct_wdi_ds.h"
-#else
-
-# include "sirParams.h"
-# include "limGlobal.h"
-# include "halTypes.h"
-# include "wlan_qct_bal.h"
-# include "wlan_qct_hal.h"
-/* This header is for ADD and remove BA session */
-# include "halCommonApi.h"
-
-#endif
/* Add Include */
@@ -133,11 +119,6 @@
WDA_VALID_STA_INDEX
}WDA_ValidStaIndex;
-#if defined( FEATURE_WLAN_NON_INTEGRATED_SOC )
-#if !defined( VOS_MQ_ID_WDA )
-#define VOS_MQ_ID_WDA VOS_MQ_ID_HAL
-#endif
-#endif
/*--------------------------------------------------------------------------
Utilities
--------------------------------------------------------------------------*/
@@ -202,56 +183,26 @@
TODO Consider refactoring it and put it into two separate headers,
one for Prima and one for Volans
-
- feturized with FEATURE_WLAN_INTEGRATED_SOC for Prima
----------------------------------------------------------------------*/
/* For backward compatability with SDIO. It's BAL header size for SDIO
interface. It's nothing for integrated SOC */
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
#define WDA_DXE_HEADER_SIZE 0
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
-#define WDA_DXE_HEADER_SIZE WLAN_BAL_DXE_HEADER_SIZE
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
-/*Libra PDU size*/
-#define WDA_TLI_PDU_RES_SIZE 124
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
/*Minimum resources needed - arbitrary*/
/*DXE + SD*/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
#define WDA_WLAN_LIBRA_HEADER_LEN (20 + 8)
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
-#define WLAN_LIBRA_HEADER_LEN (20 + 8)
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
#define WDA_TLI_BD_PDU_RESERVE_THRESHOLD 10
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
-#define WDA_TLI_BD_PDU_RESERVE_THRESHOLD 150
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_TLI_MIN_RES_MF 1
# define WDA_TLI_MIN_RES_BAP 2
# define WDA_TLI_MIN_RES_DATA 3
-#else
-# define WDA_TLI_MIN_RES_MF 13 /*Keeping for MF*/
-# define WDA_TLI_MIN_RES_BAP (WDA_TLI_MIN_RES_MF + 13) /*Another for BAP*/
-# define WDA_TLI_MIN_RES_DATA (WDA_TLI_MIN_RES_BAP + 13) /*Min 12 for data*/
-# define WLANTL_TH_RES_DATA 254
-#endif
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_NUM_STA 8
-#else
-# define WDA_NUM_STA HAL_NUM_STA
-#endif
/* For backward compatability with SDIO.
@@ -266,7 +217,6 @@
For integrated SOC, _usPktLen and _uTotalPktLen is VOS pakcet length
which does include BD header length. _uResLen is hardcoded 2.
*/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
#ifdef WINDOWS_DT
#define WDA_TLI_PROCESS_FRAME_LEN( _vosBuff, _usPktLen, \
@@ -290,29 +240,6 @@
while ( 0 )
#endif /* WINDOWS_DT */
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
-
-#define WLANTL_PDU_RES_SIZE 124 /*Libra PDU size*/
-#define WLAN_LIBRA_BD_HEADER_LEN 128 /*The lenght of the tx BD header*/
-
-/*Minimum resources needed - arbitrary*/
-
-/*DXE + SD*/
-#define WLAN_LIBRA_HEADER_LEN (20 + 8)
-
-#define WLANTL_MAX_MSDU 1538
-
-#define WDA_TLI_PROCESS_FRAME_LEN( _vosBuff, _usPktLen, \
- _uResLen, _uTotalPktLen) \
- do \
- { \
- vos_pkt_get_packet_length( _vosBuff, &_usPktLen ); \
- _uResLen = WDA_TLI_CEIL( (_usPktLen - WLAN_LIBRA_BD_HEADER_LEN), \
- WLANTL_PDU_RES_SIZE ) + 1/*The BD*/; \
- _uTotalPktLen = _usPktLen + WLAN_BAL_DXE_HEADER_SIZE; \
- } \
- while ( 0 )
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
/*--------------------------------------------------------------------------
@@ -340,14 +267,11 @@
typedef v_U32_t (*WDA_DS_TxPacketCallback) ( v_PVOID_t pContext,
vos_pkt_t **ppFrameDataBuff,
v_U32_t uSize,
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
v_U8_t uFlowMask,
-#endif
v_BOOL_t *pbUrgent );
typedef VOS_STATUS (*WDA_DS_ResourceCB) ( v_PVOID_t pContext, v_U32_t uCount );
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/* For management client */
typedef VOS_STATUS (*WDA_DS_TxCompleteCb)( v_PVOID_t pContext, wpt_packet *pFrame );
typedef VOS_STATUS (*WDA_DS_RxCompleteCb)( v_PVOID_t pContext, wpt_packet *pFrame );
@@ -577,13 +501,7 @@
// FIXME Temporary value for R33D integaration
//#define WDA_TL_TX_FRAME_TIMEOUT 20000 /* in msec a very high upper limit */
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
-#if defined( FEATURE_WLAN_NON_INTEGRATED_SOC )
-#if !defined( wdaGetGlobalSystemRole )
-#define wdaGetGlobalSystemRole halGetGlobalSystemRole
-#endif
-#endif
/* ---------------------------------------------------------------------------
@@ -595,281 +513,137 @@
---------------------------------------------------------------------------*/
/* WDA_GET_RX_MAC_HEADER *****************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_MAC_HEADER(pRxMeta) \
(tpSirMacMgmtHdr)( ((WDI_DS_RxMetaInfoType *)(pRxMeta))->mpduHeaderPtr )
-#else
-# define WDA_GET_RX_MAC_HEADER(bdHd) SIR_MAC_BD_TO_MPDUHEADER(bdHd)
-#endif
/* WDA_GET_RX_MPDUHEADER3A ****************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_MPDUHEADER3A(pRxMeta) \
(tpSirMacDataHdr3a)( ((WDI_DS_RxMetaInfoType *)(pRxMeta))->mpduHeaderPtr )
-#else
-# define WDA_GET_RX_MPDUHEADER3A(bdHd) SIR_MAC_BD_TO_MPDUHEADER3A(bdHd)
-#endif
/* WDA_GET_RX_MPDU_HEADER_LEN *************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_MPDU_HEADER_LEN(pRxMeta) \
( ((WDI_DS_RxMetaInfoType *)(pRxMeta))->mpduHeaderLength )
-#else
-# define WDA_GET_RX_MPDU_HEADER_LEN(bdHd) WLANHAL_RX_BD_GET_MPDU_H_LEN(bdHd)
-#endif
/* WDA_GET_RX_MPDU_LEN ********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_MPDU_LEN(pRxMeta) \
( ((WDI_DS_RxMetaInfoType *)(pRxMeta))->mpduLength )
-#else
-# define WDA_GET_RX_MPDU_LEN(bdHd) WLANHAL_RX_BD_GET_MPDU_LEN(bdHd)
-#endif
/* WDA_GET_RX_PAYLOAD_LEN ****************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_PAYLOAD_LEN(pRxMeta) \
( WDA_GET_RX_MPDU_LEN(pRxMeta) - WDA_GET_RX_MPDU_HEADER_LEN(pRxMeta) )
-#else
-# define WDA_GET_RX_PAYLOAD_LEN(bdHd) SIR_MAC_BD_TO_PAYLOAD_LEN(bdHd)
-#endif
/* WDA_GET_RX_MAC_RATE_IDX ***************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_MAC_RATE_IDX(pRxMeta) \
( ((WDI_DS_RxMetaInfoType *)(pRxMeta))->rateIndex )
-#else
-# define WDA_GET_RX_MAC_RATE_IDX(bdHd) SIR_MAC_BD_TO_RATE_INDEX(bdHd)
-#endif
/* WDA_GET_RX_MPDU_DATA ******************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_MPDU_DATA(pRxMeta) \
( ((WDI_DS_RxMetaInfoType *)(pRxMeta))->mpduDataPtr )
-#else
-# define WDA_GET_RX_MPDU_DATA(bdHd) SIR_MAC_BD_TO_MPDUDATA(bdHd)
-#endif
/* WDA_GET_RX_MPDU_DATA_OFFSET ***********************************************/
// For Integrated SOC: When UMAC receive the packet. BD is already stripped off.
// Data offset is the MPDU header length
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_MPDU_DATA_OFFSET(pRxMeta) WDA_GET_RX_MPDU_HEADER_LEN(pRxMeta)
-#else
-# define WDA_GET_RX_MPDU_DATA_OFFSET(bdHd) \
- WLANHAL_RX_BD_GET_MPDU_D_OFFSET(bdHd)
-#endif
/* WDA_GET_RX_MPDU_HEADER_OFFSET *********************************************/
// For Integrated SOC: We UMAC receive the frame,
// BD is gone and MAC header at offset 0
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_MPDU_HEADER_OFFSET(pRxMeta) 0
-#else
-# define WDA_GET_RX_MPDU_HEADER_OFFSET(bdHd) WLANHAL_RX_BD_GET_MPDU_H_OFFSET(bdHd)
-#endif
/* WDA_GET_RX_UNKNOWN_UCAST **************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_UNKNOWN_UCAST(pRxMeta) \
( ((WDI_DS_RxMetaInfoType *)(pRxMeta))->unknownUcastPkt )
-#else
-# define WDA_GET_RX_UNKNOWN_UCAST(bdHd) SIR_MAC_BD_IS_UNKNOWN_UCAST_FRAME(bdHd)
-#endif
/* WDA_GET_RX_TID ************************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_TID(pRxMeta) ( ((WDI_DS_RxMetaInfoType *)(pRxMeta))->tid )
-#else
-# define WDA_GET_RX_TID(bdHd) WLANHAL_RX_BD_GET_TID(bdHd)
-#endif
/* WDA_GET_RX_STAID **********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_STAID(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->staId)
-#else
-# define WDA_GET_RX_STAID(bdHd) WLANHAL_RX_BD_GET_STA_ID(bdHd)
-#endif
/* WDA_GET_RX_ADDR3_IDX ******************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_ADDR3_IDX(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->addr3Idx)
-#else
-# define WDA_GET_RX_ADDR3_IDX(bdHd) WLANHAL_RX_BD_GET_ADDR3_IDX(bdHd)
-#endif
/* WDA_GET_RX_CH *************************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_CH(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->rxChannel)
-#else
-# define WDA_GET_RX_CH(bdHd) SIR_MAC_BD_TO_RX_CHANNEL(bdHd)
-#endif
/* WDA_GET_RX_DPUSIG *********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_DPUSIG(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->dpuSig)
-#else
-# define WDA_GET_RX_DPUSIG(bdHd) WLANHAL_RX_BD_GET_DPU_SIG(bdHd)
-#endif
/* WDA_IS_RX_BCAST ***********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_IS_RX_BCAST(pRxMeta) \
( (1 == ((WDI_DS_RxMetaInfoType*)(pRxMeta))->bcast) ? VOS_TRUE : VOS_FALSE )
-#else
-# define WDA_IS_RX_BCAST(bdHd) \
- ( ( 0xFF == WLANHAL_RX_BD_GET_ADDR1_IDX(bdHd)) ? VOS_TRUE : VOS_FALSE )
-#endif
/* WDA_GET_RX_FT_DONE ********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_FT_DONE(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->ft)
-#else
-# define WDA_GET_RX_FT_DONE(bdHd) WLANHAL_RX_BD_GET_FT(bdHd)
-#endif
/* WDA_GET_RX_DPU_FEEDBACK **************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_DPU_FEEDBACK(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->dpuFeedback)
-#endif
/* WDA_GET_RX_ASF ************************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_ASF(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->amsdu_asf)
-#else
-# define WDA_GET_RX_ASF(bdHd) WLANHAL_RX_BD_GET_ASF(bdHd)
-#endif
/* WDA_GET_RX_AEF ************************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_AEF(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->amsdu_aef)
-#else
-# define WDA_GET_RX_AEF(bdHd) WLANHAL_RX_BD_GET_AEF(bdHd)
-#endif
/* WDA_GET_RX_ESF ************************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_ESF(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->amsdu_esf)
-#else
-# define WDA_GET_RX_ESF(bdHd) WLANHAL_RX_BD_GET_ESF(bdHd)
-#endif
/* WDA_GET_RX_BEACON_SENT ****************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_BEACON_SENT(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->bsf)
-#else
-# define WDA_GET_RX_BEACON_SENT(bdHd) SIR_MAC_BD_TO_IBSS_BCN_SENT(bdHd)
-#endif
/* WDA_GET_RX_TSF_LATER *****************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_TSF_LATER(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->rtsf)
-#else
-# define WDA_GET_RX_TSF_LATER(bdHd) SIR_MAC_BD_TO_IBSS_TSF_LATER(bdHd)
-#endif
/* WDA_GET_RX_TYPE ***********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_TYPE(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->type)
-#else
-# define WDA_GET_RX_TYPE(bdHd) \
- ( ( WLANHAL_RX_BD_GET_TYPE_SUBTYPE(bdHd) & 0x30 ) >> 4 )
-#endif
/* WDA_GET_RX_SUBTYPE ********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_SUBTYPE(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->subtype)
-#else
-# define WDA_GET_RX_SUBTYPE(bdHd) ( WLANHAL_RX_BD_GET_TYPE_SUBTYPE(bdHd) & 0x0F )
-#endif
/* WDA_GET_RX_TYPE_SUBTYPE ****************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_TYPE_SUBTYPE(pRxMeta) \
((WDA_GET_RX_TYPE(pRxMeta)<<4)|WDA_GET_RX_SUBTYPE(pRxMeta))
-#else
-# define WDA_GET_RX_TYPE_SUBTYPE(bdHd) WLANHAL_RX_BD_GET_TYPE_SUBTYPE(bdHd)
-#endif
/* WDA_GET_RX_REORDER_OPCODE : For MSDU reorder *******************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_REORDER_OPCODE(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->ampdu_reorderOpcode)
-#else
-# define WDA_GET_RX_REORDER_OPCODE(bdHd) WLANHAL_RX_BD_GET_BA_OPCODE(bdHd)
-#endif
/* WDA_GET_RX_REORDER_SLOT_IDX : For MSDU reorder ****************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_REORDER_SLOT_IDX(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->ampdu_reorderSlotIdx)
-#else
-# define WDA_GET_RX_REORDER_SLOT_IDX(bdHd) WLANHAL_RX_BD_GET_BA_SI(bdHd)
-#endif
/* WDA_GET_RX_REORDER_FWD_IDX : For MSDU reorder *****************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_REORDER_FWD_IDX(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->ampdu_reorderFwdIdx)
-#else
-# define WDA_GET_RX_REORDER_FWD_IDX(bdHd) WLANHAL_RX_BD_GET_BA_FI(bdHd)
-#endif
/* WDA_GET_RX_REORDER_CUR_PKT_SEQ_NO : Fro MSDU reorder **********************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_REORDER_CUR_PKT_SEQ_NO(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->currentPktSeqNo)
-#else
-# define WDA_GET_RX_REORDER_CUR_PKT_SEQ_NO(bdHd) \
- WLANHAL_RX_BD_GET_BA_CSN(bdHd)
-#endif
/* WDA_IS_RX_LLC_PRESENT *****************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_IS_RX_LLC_PRESENT(pRxMeta) \
( (0 == ((WDI_DS_RxMetaInfoType*)(pRxMeta))->llcr) ? VOS_TRUE : VOS_FALSE )
-#else
-# define WDA_IS_RX_LLC_PRESENT(bdHd) \
- ( (0 == (v_U8_t)WLANHAL_RX_BD_GET_LLC(bdHd) ) ? VOS_TRUE : VOS_FALSE )
-#endif
#define WLANWDA_HO_IS_AN_AMPDU 0x4000
#define WLANWDA_HO_LAST_MPDU_OF_AMPDU 0x400
/* WDA_IS_RX_AN_AMPDU ********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_IS_RX_AN_AMPDU(pRxMeta) \
( ((WDI_DS_RxMetaInfoType*)(pRxMeta))->rxpFlags & WLANWDA_HO_IS_AN_AMPDU )
-#else
-# define WDA_IS_RX_AN_AMPDU(bdHd) WLAN_HAL_IS_AN_AMPDU(bdHd)
-#endif
/* WDA_IS_RX_LAST_MPDU *******************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_IS_RX_LAST_MPDU(pRxMeta) \
( ((WDI_DS_RxMetaInfoType*)(pRxMeta))->rxpFlags & WLANWDA_HO_LAST_MPDU_OF_AMPDU )
-#else
-# define WDA_IS_RX_LAST_MPDU(bdHd) WLAN_HAL_IS_LAST_MPDU(bdHd)
-#endif
/* WDA_GET_RX_TIMESTAMP *****************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_TIMESTAMP(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->mclkRxTimestamp)
-#else
-# define WDA_GET_RX_TIMESTAMP(bdHd) SIR_MAC_BD_RX_TIMESTAMP(bdHd)
-#endif
/* WDA_IS_RX_IN_SCAN *********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_IS_RX_IN_SCAN(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->scan)
-#else
-# define WDA_IS_RX_IN_SCAN(bdHd) SIR_MAC_BD_TO_SCAN_LEARN(bdHd)
-#endif
/* WDA_GET_RX_RSSI_DB ********************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
// Volans RF
# define WDA_RSSI_OFFSET 100
# define WDA_GET_RSSI0_DB(rssi0) (rssi0 - WDA_RSSI_OFFSET)
@@ -879,101 +653,54 @@
WDA_MAX_OF_TWO(WDA_GET_RSSI0_DB(rssi0), WDA_GET_RSSI1_DB(rssi0))
# define WDA_GET_RX_RSSI_DB(pRxMeta) \
WDA_GET_RSSI_DB((((WDI_DS_RxMetaInfoType*)(pRxMeta))->rssi0))
-#else
-# define WDA_GET_RX_RSSI_DB(bdHd) SIR_MAC_BD_TO_RSSI_DB(bdHd)
-#endif
/* WDA_GET_RX_SNR ************************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_SNR(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->snr)
-#else
-# define WDA_GET_RX_SNR(bdHd) WLANHAL_RX_BD_GET_SNR(bdHd)
-#endif
/* WDA_IS_RX_FC **************************************************************/
// Flow control frames
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/* FIXME WDA should provide the meta info which indicates FC frame
In the meantime, use hardcoded FALSE, since we don't support FC yet */
# define WDA_IS_RX_FC(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->fc)
-#else
-# define WDA_IS_RX_FC(bdHd) WLANHAL_RX_BD_GET_FC(bdHd)
-#endif
/* WDA_GET_RX_FC_VALID_STA_MASK **********************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_FC_VALID_STA_MASK(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->fcSTAValidMask)
-#else
-# define WDA_GET_RX_FC_VALID_STA_MASK(bdHd) \
- WLANHAL_RX_BD_GET_STA_VALID_MASK(bdHd)
-#endif
/* WDA_GET_RX_FC_PWRSAVE_STA_MASK ********************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_FC_PWRSAVE_STA_MASK(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->fcSTAPwrSaveStateMask)
-#else
-# define WDA_GET_RX_FC_PWRSAVE_STA_MASK(bdHd) \
- WLANHAL_RX_BD_GET_STA_PS_STATE(bdHd)
-#endif
/* WDA_GET_RX_FC_STA_THRD_IND_MASK ********************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_FC_STA_THRD_IND_MASK(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->fcSTAThreshIndMask)
-#else
-# define WDA_GET_RX_FC_STA_THRD_IND_MASK(bdHd) \
- WLANHAL_RX_BD_GET_STA_TH_IND(bdHd)
-#endif
/* WDA_GET_RX_FC_FORCED_STA_TX_DISABLED_BITMAP ********************************************/
# define WDA_GET_RX_FC_STA_TX_DISABLED_BITMAP(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->fcStaTxDisabledBitmap)
/* WDA_GET_RX_FC_STA_TXQ_LEN *************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_FC_STA_TXQ_LEN(pRxMeta, staId) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->fcSTATxQLen[(staId)])
-#else
-# define WDA_GET_RX_FC_STA_TXQ_LEN(bdHd, staId) \
- WLANHAL_RX_BD_GET_STA_TXQ_LEN( _pvBDHeader, staId )
-#endif
/* WDA_GET_RX_FC_STA_CUR_TXRATE **********************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_FC_STA_CUR_TXRATE(pRxMeta, staId) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->fcSTACurTxRate[(staId)])
-#else
-# define WDA_GET_RX_FC_STA_CUR_TXRATE(bdHd, staId) \
- WLANHAL_RX_BD_GET_STA_CUR_TX_RATE( bdHd, staIdx )
-#endif
/* WDA_GET_RX_REPLAY_COUNT ***************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GET_RX_REPLAY_COUNT(pRxMeta) \
(((WDI_DS_RxMetaInfoType*)(pRxMeta))->replayCount)
-#endif
/* WDA_GETRSSI0 ***************************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GETRSSI0(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->rssi0)
-#else
-# define WDA_GETRSSI0(bdHd) (v_S7_t)(HAL_GET_RSSI0_DB(SIR_MAC_BD_TO_PHY_STATS0(bdHd)))
-#endif
/* WDA_GETRSSI1 ***************************************************************/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_GETRSSI1(pRxMeta) (((WDI_DS_RxMetaInfoType*)(pRxMeta))->rssi1)
-#else
-# define WDA_GETRSSI1(bdHd) (v_S7_t)(HAL_GET_RSSI1_DB(SIR_MAC_BD_TO_PHY_STATS0(bdHd)))
-#endif
/* --------------------------------------------------------------------*/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
uint8 WDA_IsWcnssWlanCompiledVersionGreaterThanOrEqual(uint8 major, uint8 minor, uint8 version, uint8 revision);
uint8 WDA_IsWcnssWlanReportedVersionGreaterThanOrEqual(uint8 major, uint8 minor, uint8 version, uint8 revision);
@@ -995,12 +722,8 @@
// Just declare the function extern here and save some time.
extern tSirRetStatus halMmhForwardMBmsg(void*, tSirMbMsg*);
tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb);
-#else
-# define uMacPostCtrlMsg(hal, msg) halMmhForwardMBmsg(hal, msg)
-#endif
-#if defined(FEATURE_WLAN_NON_INTEGRATED_SOC) || defined(FEATURE_WLAN_INTEGRATED_SOC)
#define WDA_MAX_TXPOWER_INVALID HAL_MAX_TXPOWER_INVALID
//WDA Messages to HAL messages Mapping
@@ -1259,7 +982,6 @@
#define WDA_MMH_TXMB_READY_EVT SIR_HAL_MMH_TXMB_READY_EVT
#define WDA_MMH_RXMB_DONE_EVT SIR_HAL_MMH_RXMB_DONE_EVT
#define WDA_MMH_MSGQ_NE_EVT SIR_HAL_MMH_MSGQ_NE_EVT
-#endif
#ifdef WLAN_FEATURE_VOWIFI_11R
#define WDA_AGGR_QOS_REQ SIR_HAL_AGGR_QOS_REQ
@@ -1308,26 +1030,12 @@
#define WDA_UPDATE_OP_MODE SIR_HAL_UPDATE_OP_MODE
#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
tSirRetStatus wdaPostCtrlMsg(tpAniSirGlobal pMac, tSirMsgQ *pMsg);
-#endif
-#if defined(FEATURE_WLAN_NON_INTEGRATED_SOC)
-#define VOS_MODULE_ID_WDA VOS_MODULE_ID_HAL
-
-//Required by TL
-
-//WDA Functions to HAL functions Mapping
-//Required by SME and PE
-#define WDA_SetRegDomain halPhySetRegDomain
-#define wdaPostCtrlMsg halPostMsgApi
-#else
eHalStatus WDA_SetRegDomain(void * clientCtxt, v_REGDOMAIN_t regId);
-#endif //FEATURE_WLAN_NON_INTEGRATED_SOC
#define HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME 0x40 // Bit 6 will be used to control BD rate for Management frames
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
#define halTxFrame(hHal, pFrmBuf, frmLen, frmType, txDir, tid, pCompFunc, pData, txFlag) \
(eHalStatus)( WDA_TxPacket(\
vos_get_context(VOS_MODULE_ID_WDA, vos_get_global_context(VOS_MODULE_ID_WDA, (hHal))),\
@@ -1353,48 +1061,25 @@
(pData),\
(pCBackFnTxComp), \
(txFlag)) )
-#endif
/* -----------------------------------------------------------------
WDA data path API's for TL
-------------------------------------------------------------------*/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
v_BOOL_t WDA_IsHwFrameTxTranslationCapable(v_PVOID_t pVosGCtx,
tANI_U8 staIdx);
-#else
-# define WDA_IsHwFrameTxTranslationCapable(vosGCtx, staId) \
- WLANHAL_IsHwFrameTxTranslationCapable(vosGCtx, staId)
-#endif
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_EnableUapsdAcParams(vosGCtx, staId, uapsdInfo) \
WDA_SetUapsdAcParamsReq(vosGCtx, staId, uapsdInfo)
-#else
-# define WDA_EnableUapsdAcParams(vosGCtx, staId, uapsdInfo) \
- WLANHAL_EnableUapsdAcParams(vosGCtx, staId, uapsdInfo)
-#endif
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_DisableUapsdAcParams(vosGCtx, staId, ac) \
WDA_ClearUapsdAcParamsReq(vosGCtx, staId, ac)
-#else
-# define WDA_DisableUapsdAcParams(vosGCtx, staId, ac) \
- WLANHAL_DisableUapsdAcParams(vosGCtx, staId, ac)
-#endif
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
# define WDA_SetRSSIThresholds(pMac, pThresholds) \
WDA_SetRSSIThresholdsReq(pMac, pThresholds)
-#else
-# define WDA_SetRSSIThresholds(pMac, pThresholds) \
- halPS_SetRSSIThresholds(pMac, pThresholds)
-#endif
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
#define WDA_UpdateRssiBmps(pvosGCtx, staId, rssi) \
WLANTL_UpdateRssiBmps(pvosGCtx, staId, rssi)
-#endif
#ifdef WLAN_PERF
/*==========================================================================
@@ -1876,7 +1561,6 @@
tpSirRSSIThresholds pThresholds
);
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/*==========================================================================
FUNCTION WDA_DS_TxFrames
@@ -1910,7 +1594,6 @@
(
v_PVOID_t pvosGCtx
);
-#endif
/*==========================================================================
FUNCTION WDA_DS_TxFlowControlCallback
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index b88a90d..e8e62f5 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -66,7 +66,6 @@
2010-12-30 smiryala UMAC convergence changes
2010-08-19 adwivedi WLAN DAL AL(WDA) layer for Prima
===========================================================================*/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
#include "vos_mq.h"
#include "vos_api.h"
#include "vos_packet.h"
@@ -10993,7 +10992,6 @@
}
return eHAL_STATUS_SUCCESS;
}
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
#ifdef FEATURE_WLAN_SCAN_PNO
/*
diff --git a/CORE/WDA/src/wlan_qct_wda_ds.c b/CORE/WDA/src/wlan_qct_wda_ds.c
index 7908c1d..360ebee 100644
--- a/CORE/WDA/src/wlan_qct_wda_ds.c
+++ b/CORE/WDA/src/wlan_qct_wda_ds.c
@@ -81,9 +81,6 @@
#include "wlan_qct_tl.h"
#include "wlan_qct_tli.h"
#include "tlDebug.h"
-#if defined( FEATURE_WLAN_NON_INTEGRATED_SOC )
-#include "wlan_bal_misc.h"
-#endif
#define WDA_DS_DXE_RES_COUNT (WDA_TLI_MIN_RES_DATA + 20)
@@ -94,7 +91,6 @@
#define WDA_TL_IS_TX_XMIT_PENDING(a) WLANTL_IsTxXmitPending(a)
#define WDA_TL_CLEAR_TX_XMIT_PENDING(a) WLANTL_ClearTxXmitPending(a)
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
#define WDA_HI_FLOW_MASK 0xF0
#define WDA_LO_FLOW_MASK 0x0F
@@ -104,159 +100,7 @@
v_PVOID_t pvosGCtx,
v_PVOID_t pFrameDataBuff
);
-#endif
-#if defined( FEATURE_WLAN_NON_INTEGRATED_SOC )
-/*==========================================================================
- FUNCTION WDA_DS_PrepareBDHeader
-
- DESCRIPTION
- Inline function for preparing BD header before HAL processing.
-
- DEPENDENCIES
- Just notify HAL that suspend in TL is complete.
-
- PARAMETERS
-
- IN
- vosDataBuff: vos data buffer
- ucDisableFrmXtl: is frame xtl disabled
-
- OUT
- ppvBDHeader: it will contain the BD header
- pvDestMacAddr: it will contain the destination MAC address
- pvosStatus: status of the combined processing
- pusPktLen: packet len.
-
- RETURN VALUE
- No return.
-
- SIDE EFFECTS
-
-============================================================================*/
-void
-WDA_DS_PrepareBDHeader
-(
- vos_pkt_t* vosDataBuff,
- v_PVOID_t* ppvBDHeader,
- v_MACADDR_t* pvDestMacAddr,
- v_U8_t ucDisableFrmXtl,
- VOS_STATUS* pvosStatus,
- v_U16_t* pusPktLen,
- v_U8_t ucQosEnabled,
- v_U8_t ucWDSEnabled,
- v_U8_t extraHeadSpace
-)
-{
- v_U8_t ucHeaderOffset;
- v_U8_t ucHeaderLen;
-#ifndef WLAN_SOFTAP_FEATURE
- v_PVOID_t pvPeekData;
-#endif
- v_U8_t ucBDHeaderLen = WLANTL_BD_HEADER_LEN(ucDisableFrmXtl);
-
- /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
- /*-------------------------------------------------------------------------
- Get header pointer from VOSS
- !!! make sure reserve head zeros out the memory
- -------------------------------------------------------------------------*/
- vos_pkt_get_packet_length( vosDataBuff, pusPktLen);
-
- if ( WLANTL_MAC_HEADER_LEN(ucDisableFrmXtl) > *pusPktLen )
- {
- TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL: Length of the packet smaller than expected network"
- " header %d", *pusPktLen ));
-
- *pvosStatus = VOS_STATUS_E_INVAL;
- return;
- }
-
- vos_pkt_reserve_head( vosDataBuff, ppvBDHeader,
- ucBDHeaderLen );
- if ( NULL == *ppvBDHeader )
- {
- TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:VOSS packet corrupted on Attach BD header"));
- *pvosStatus = VOS_STATUS_E_INVAL;
- return;
- }
-
- /*-----------------------------------------------------------------------
- Extract MAC address
- -----------------------------------------------------------------------*/
-#ifdef WLAN_SOFTAP_FEATURE
- {
- v_SIZE_t usMacAddrSize = VOS_MAC_ADDR_SIZE;
- *pvosStatus = vos_pkt_extract_data( vosDataBuff,
- ucBDHeaderLen +
- WLANTL_MAC_ADDR_ALIGN(ucDisableFrmXtl),
- (v_PVOID_t)pvDestMacAddr,
- &usMacAddrSize );
- }
-#else
- *pvosStatus = vos_pkt_peek_data( vosDataBuff,
- ucBDHeaderLen +
- WLANTL_MAC_ADDR_ALIGN(ucDisableFrmXtl),
- (v_PVOID_t)&pvPeekData,
- VOS_MAC_ADDR_SIZE );
-
- /*Fix me*/
- vos_copy_macaddr(pvDestMacAddr, (v_MACADDR_t*)pvPeekData);
-#endif
- if ( VOS_STATUS_SUCCESS != *pvosStatus )
- {
- TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:Failed while attempting to extract MAC Addr %d",
- *pvosStatus));
- }
- else
- {
- /*---------------------------------------------------------------------
- Fill MPDU info fields:
- - MPDU data start offset
- - MPDU header start offset
- - MPDU header length
- - MPDU length - this is a 16b field - needs swapping
- --------------------------------------------------------------------*/
- ucHeaderOffset = ucBDHeaderLen;
- ucHeaderLen = WLANTL_MAC_HEADER_LEN(ucDisableFrmXtl);
-
- if ( 0 != ucDisableFrmXtl )
- {
- if ( 0 != ucQosEnabled )
- {
- ucHeaderLen += WLANTL_802_11_HEADER_QOS_CTL;
- }
-
- // Similar to Qos we need something for WDS format !
- if ( ucWDSEnabled != 0 )
- {
- // If we have frame translation enabled
- ucHeaderLen += WLANTL_802_11_HEADER_ADDR4_LEN;
- }
- if ( extraHeadSpace != 0 )
- {
- // Decrease the packet length with the extra padding after the header
- *pusPktLen = *pusPktLen - extraHeadSpace;
- }
- }
-
- WLANHAL_TX_BD_SET_MPDU_HEADER_LEN( *ppvBDHeader, ucHeaderLen);
- WLANHAL_TX_BD_SET_MPDU_HEADER_OFFSET( *ppvBDHeader, ucHeaderOffset);
- WLANHAL_TX_BD_SET_MPDU_DATA_OFFSET( *ppvBDHeader,
- ucHeaderOffset + ucHeaderLen + extraHeadSpace);
- WLANHAL_TX_BD_SET_MPDU_LEN( *ppvBDHeader, *pusPktLen);
-
- TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN TL: VALUES ARE HLen=%x Hoff=%x doff=%x len=%x ex=%d",
- ucHeaderLen, ucHeaderOffset,
- (ucHeaderOffset + ucHeaderLen + extraHeadSpace),
- *pusPktLen, extraHeadSpace));
- }/* if peek MAC success*/
-
-}/* WLANTL_PrepareBDHeader */
-#endif /* FEATURE_WLAN_NON_INTEGRATED_SOC */
#ifdef WLAN_PERF
/*==========================================================================
@@ -305,86 +149,9 @@
WLAN_STADescType* pStaInfo
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/* FIXME WDI/WDA should support this function
once HAL supports it
*/
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- v_PVOID_t pvPeekData;
- v_U8_t ucDxEBDWLANHeaderLen = WLANTL_BD_HEADER_LEN(0) + sizeof(WLANBAL_sDXEHeaderType);
- v_U8_t ucIsUnicast;
- WLANBAL_sDXEHeaderType *pDxEHeader;
- v_PVOID_t pvBDHeader;
- v_PVOID_t pucBuffPtr;
- v_U16_t usPktLen;
-
- /*-----------------------------------------------------------------------
- Extract packet length
- -----------------------------------------------------------------------*/
-
- vos_pkt_get_packet_length( vosDataBuff, &usPktLen);
-
- /*-----------------------------------------------------------------------
- Extract MAC address
- -----------------------------------------------------------------------*/
- *pvosStatus = vos_pkt_peek_data( vosDataBuff,
- WLANTL_MAC_ADDR_ALIGN(0),
- (v_PVOID_t)&pvPeekData,
- VOS_MAC_ADDR_SIZE );
-
- if ( VOS_STATUS_SUCCESS != *pvosStatus )
- {
- TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:Failed while attempting to extract MAC Addr %d",
- *pvosStatus));
- *pvosStatus = VOS_STATUS_E_INVAL;
- return;
- }
-
- /*-----------------------------------------------------------------------
- Reserve head room for DxE header, BD, and WLAN header
- -----------------------------------------------------------------------*/
-
- vos_pkt_reserve_head( vosDataBuff, &pucBuffPtr,
- ucDxEBDWLANHeaderLen );
- if ( NULL == pucBuffPtr )
- {
- TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:No enough space in VOSS packet %p for DxE/BD/WLAN header", vosDataBuff));
- *pvosStatus = VOS_STATUS_E_INVAL;
- return;
- }
- pDxEHeader = (WLANBAL_sDXEHeaderType *)pucBuffPtr;
- pvBDHeader = (v_PVOID_t) &pDxEHeader[1];
-
- /* UMA Tx acceleration is enabled.
- * UMA would help convert frames to 802.11, fill partial BD fields and
- * construct LLC header. To further accelerate this kind of frames,
- * HAL would attempt to reuse the BD descriptor if the BD signature
- * matches to the saved BD descriptor.
- */
- if(pStaInfo->wSTAType == WLAN_STA_IBSS)
- ucIsUnicast = !(((tANI_U8 *)pvPeekData)[0] & 0x01);
- else
- ucIsUnicast = 1;
-
- *puFastFwdOK = (v_U32_t) WLANHAL_TxBdFastFwd(pvosGCtx, pvPeekData, pMetaInfo->ucTID, ucIsUnicast, pvBDHeader, usPktLen );
-
- /* Can't be fast forwarded. Trim the VOS head back to original location. */
- if(! *puFastFwdOK){
- vos_pkt_trim_head(vosDataBuff, ucDxEBDWLANHeaderLen);
- }else{
- /* could be fast forwarded. Now notify BAL DxE header filling could be completely skipped
- */
- v_U32_t uPacketSize = WLANTL_BD_HEADER_LEN(0) + usPktLen;
- vos_pkt_set_user_data_ptr( vosDataBuff, VOS_PKT_USER_DATA_ID_BAL,
- (v_PVOID_t)uPacketSize);
- pDxEHeader->size = SWAP_ENDIAN_UINT32(uPacketSize);
- }
-
- *pvosStatus = VOS_STATUS_SUCCESS;
- return;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
#endif /*WLAN_PERF*/
@@ -440,7 +207,6 @@
v_U32_t *uAvailableTxBuf
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
tWDA_CbContext *wdaContext = NULL;
WDI_Status wdiStatus;
@@ -499,61 +265,6 @@
*uAvailableTxBuf = WDA_DS_DXE_RES_COUNT;
return VOS_STATUS_SUCCESS;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- VOS_STATUS vosStatus;
- WLANBAL_TlRegType tlReg;
-
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN WDA: WDA_DS_Register" );
-
- /*------------------------------------------------------------------------
- Sanity check
- ------------------------------------------------------------------------*/
- if ( ( NULL == pvosGCtx ) ||
- ( NULL == pfnTxPacketCallback ) ||
- ( NULL == pfnTxCompleteCallback ) ||
- ( NULL == pfnRxPacketCallback ) ||
- ( NULL == pfnResourceCB ) )
- {
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN WDA:Invalid pointers on WDA_DS_Register" );
- return VOS_STATUS_E_FAULT;
- }
-
- /*------------------------------------------------------------------------
- Register with BAL as transport layer client
- ------------------------------------------------------------------------*/
- tlReg.receiveFrameCB = pfnRxPacketCallback;
- tlReg.getTXFrameCB = pfnTxPacketCallback;
- tlReg.txCompleteCB = pfnTxCompleteCallback;
- tlReg.txResourceCB = pfnResourceCB;
- tlReg.txResourceThreashold = uResTheshold;
- tlReg.tlUsrData = pvosGCtx;
-
- vosStatus = WLANBAL_RegTlCbFunctions( pvosGCtx, &tlReg );
-
- if ( VOS_STATUS_SUCCESS != vosStatus )
- {
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL: TL failed to register with BAL, Err: %d", vosStatus );
- return vosStatus;
- }
-
- /*------------------------------------------------------------------------
- Request resources for tx from bus
- ------------------------------------------------------------------------*/
- vosStatus = WLANBAL_GetTxResources( pvosGCtx, uAvailableTxBuf );
-
- if ( VOS_STATUS_SUCCESS != vosStatus )
- {
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:TL failed to get resources from BAL, Err: %d",
- vosStatus );
- return vosStatus;
- }
-
- return vosStatus;
-#endif
}
/*==========================================================================
@@ -587,7 +298,6 @@
v_PVOID_t pvosGCtx
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
vos_msg_t sMessage;
VOS_STATUS status;
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -624,9 +334,6 @@
WDA_TL_CLEAR_TX_XMIT_PENDING(pvosGCtx);
}
return status;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- return WLANBAL_StartXmit( pvosGCtx );
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
@@ -733,7 +440,6 @@
v_U8_t ucUP
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
VOS_STATUS vosStatus;
WDI_DS_TxMetaInfoType* pTxMetaInfo = NULL;
v_SIZE_t usMacAddrSize;
@@ -811,33 +517,6 @@
pTxMetaInfo->isEapol, pTxMetaInfo->fdisableFrmXlt, pTxMetaInfo->frmType );
return VOS_STATUS_SUCCESS;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- VOS_STATUS vosStatus;
- v_PVOID_t pvBDHeader;
-
- WDA_DS_PrepareBDHeader( vosDataBuff, &pvBDHeader, pvDestMacAddr, ucDisableFrmXtl,
- &vosStatus, pusPktLen, ucQosEnabled, ucWDSEnabled, extraHeadSpace );
-
- if ( VOS_STATUS_SUCCESS != vosStatus )
- {
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:Failed while attempting to prepare BD %d", vosStatus );
- return vosStatus;
- }
-
- vosStatus = WLANHAL_FillTxBd( pvosGCtx, typeSubtype, pvDestMacAddr, pAddr2,
- &uTid, ucDisableFrmXtl, pvBDHeader, txFlag, timeStamp );
-
- if ( VOS_STATUS_SUCCESS != vosStatus )
- {
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:Failed while attempting to fill BD %d", vosStatus );
- return vosStatus;
- }
-
- return VOS_STATUS_SUCCESS;
-
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
@@ -868,58 +547,10 @@
vos_pkt_t *vosDataBuff
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/* Nothing to trim
* Do Nothing */
return VOS_STATUS_SUCCESS;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- VOS_STATUS vosStatus = VOS_STATUS_SUCCESS;
- v_U16_t usPktLen;
- v_U8_t ucMPDUHOffset;
- v_U16_t usMPDUDOffset;
- v_U16_t usMPDULen;
- v_U8_t ucMPDUHLen = 0;
- v_U8_t aucBDHeader[WLANHAL_RX_BD_HEADER_SIZE];
-
- vos_pkt_pop_head( vosDataBuff, aucBDHeader, WLANHAL_RX_BD_HEADER_SIZE);
-
- ucMPDUHOffset = (v_U8_t)WLANHAL_RX_BD_GET_MPDU_H_OFFSET(aucBDHeader);
- usMPDUDOffset = (v_U16_t)WLANHAL_RX_BD_GET_MPDU_D_OFFSET(aucBDHeader);
- usMPDULen = (v_U16_t)WLANHAL_RX_BD_GET_MPDU_LEN(aucBDHeader);
- ucMPDUHLen = (v_U8_t)WLANHAL_RX_BD_GET_MPDU_H_LEN(aucBDHeader);
-
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN TL:BD header processing data: HO %d DO %d Len %d HLen %d"
- " Tid %d BD %d",
- ucMPDUHOffset, usMPDUDOffset, usMPDULen, ucMPDUHLen,
- WLANHAL_RX_BD_HEADER_SIZE );
-
- vos_pkt_get_packet_length( vosDataBuff, &usPktLen);
-
- if (( ucMPDUHOffset >= WLANHAL_RX_BD_HEADER_SIZE ) &&
- ( usMPDUDOffset > ucMPDUHOffset ) &&
- ( usMPDULen >= ucMPDUHLen ) &&
- ( usPktLen >= usMPDULen ))
- {
- if((ucMPDUHOffset - WLANHAL_RX_BD_HEADER_SIZE) > 0)
- {
- vos_pkt_trim_head( vosDataBuff, ucMPDUHOffset - WLANHAL_RX_BD_HEADER_SIZE);
- }
- else
- {
- /* Nothing to trim
- * Do Nothing */
- }
- vosStatus = VOS_STATUS_SUCCESS;
- }
- else
- {
- vosStatus = VOS_STATUS_E_FAILURE;
- }
-
- return vosStatus;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
@@ -960,7 +591,6 @@
v_BOOL_t bSwap
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/*------------------------------------------------------------------------
Sanity check
------------------------------------------------------------------------*/
@@ -981,26 +611,6 @@
}
return VOS_STATUS_SUCCESS;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- VOS_STATUS vosStatus;
-
- vosStatus = vos_pkt_peek_data( vosDataBuff, 0, (v_PVOID_t)ppRxHeader,
- WLANHAL_RX_BD_HEADER_SIZE);
-
- if ( ( VOS_STATUS_SUCCESS != vosStatus ) || ( NULL == (v_PVOID_t)ppRxHeader ) )
- {
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WDA :Cannot extract BD header" );
- return VOS_STATUS_E_FAILURE;
- }
-
- if ( VOS_TRUE == bSwap )
- {
- WLANHAL_SwapRxBd( *ppRxHeader );
- }
-
- return VOS_STATUS_SUCCESS;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
@@ -1045,7 +655,6 @@
v_U8_t *ucTypeSubtype
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/*------------------------------------------------------------------------
Sanity check
------------------------------------------------------------------------*/
@@ -1059,40 +668,6 @@
*ucTypeSubtype = ( WDA_GET_RX_TYPE( pRxHeader ) << 4 ) | WDA_GET_RX_SUBTYPE( pRxHeader );
return VOS_STATUS_SUCCESS;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- v_PVOID_t pvBDHeader = pRxHeader;
- v_U16_t usFrmCtrl = 0;
- v_U8_t ucFrmType;
- v_SIZE_t usFrmCtrlSize = sizeof(usFrmCtrl);
- VOS_STATUS vosStatus;
-
- /*---------------------------------------------------------------------
- Extract frame control field from 802.11 header if present
- (frame translation not done)
- ---------------------------------------------------------------------*/
- vosStatus = vos_pkt_extract_data( vosDataBuff,
- ( 0 == WLANHAL_RX_BD_GET_FT(pvBDHeader) ) ?
- WLANHAL_RX_BD_GET_MPDU_H_OFFSET(pvBDHeader):
- WLANHAL_RX_BD_HEADER_SIZE,
- &usFrmCtrl, &usFrmCtrlSize );
-
- if (( VOS_STATUS_SUCCESS != vosStatus ) ||
- ( sizeof(usFrmCtrl) != usFrmCtrlSize ))
- {
- VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL: Cannot extract Frame Control Field" );
- return VOS_STATUS_E_FAILURE;
- }
-
-
- ucFrmType = (v_U8_t)WLANHAL_RxBD_GetFrameTypeSubType( pvBDHeader,
- usFrmCtrl);
- WLANHAL_RX_BD_SET_TYPE_SUBTYPE(pvBDHeader, ucFrmType);
-
- *ucTypeSubtype = ucFrmType;
-
- return VOS_STATUS_SUCCESS;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
@@ -1129,16 +704,8 @@
v_PVOID_t pvBDHeader
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/* Do nothing for Prima */
return VOS_STATUS_SUCCESS;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- /* AMSDU HW bug fix
- * After 2nd AMSDU subframe HW could not handle BD correctly
- * HAL workaround is needed */
- WLANHAL_RxAmsduBdFix(pvosGCtx, pvBDHeader);
- return VOS_STATUS_SUCCESS;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
/*==========================================================================
@@ -1174,17 +741,12 @@
v_S7_t* puRssi
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
"WDA:halPS_GetRssi no longer supported. Need replacement");
*puRssi = -30;
return VOS_STATUS_SUCCESS;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- halPS_GetRssi(vos_get_context(VOS_MODULE_ID_SME, pvosGCtx), puRssi);
- return VOS_STATUS_SUCCESS;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
/*==========================================================================
@@ -1220,14 +782,10 @@
v_U32_t* puResCount
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/* Return minimum necessary number of packet(DXE descriptor) for data */
/* TODO Need to get this from DXE??? */
*puResCount = WDA_TLI_BD_PDU_RESERVE_THRESHOLD + 50;
return VOS_STATUS_SUCCESS;
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- return WLANBAL_GetTxResources( pvosGCtx, puResCount );
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
@@ -1259,42 +817,9 @@
v_PVOID_t pRxHeader
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
return WDA_GET_RX_REPLAY_COUNT( pRxHeader );
-#else /* FEATURE_WLAN_INTEGRATED_SOC */
- v_U8_t *pucRxBDHeader = pRxHeader;
-
-/* 48-bit replay counter is created as follows
- from RX BD 6 byte PMI command:
- Addr : AES/TKIP
- 0x38 : pn3/tsc3
- 0x39 : pn2/tsc2
- 0x3a : pn1/tsc1
- 0x3b : pn0/tsc0
-
- 0x3c : pn5/tsc5
- 0x3d : pn4/tsc4 */
-
-#ifdef ANI_BIG_BYTE_ENDIAN
- v_U64_t ullcurrentReplayCounter = 0;
- /* Getting 48-bit replay counter from the RX BD */
- ullcurrentReplayCounter = WLANHAL_RX_BD_GET_PMICMD_20TO23(pucRxBDHeader);
- ullcurrentReplayCounter <<= 16;
- ullcurrentReplayCounter |= (( WLANHAL_RX_BD_GET_PMICMD_24TO25(pucRxBDHeader) & 0xFFFF0000) >> 16);
- return ullcurrentReplayCounter;
-#else
- v_U64_t ullcurrentReplayCounter = 0;
- /* Getting 48-bit replay counter from the RX BD */
- ullcurrentReplayCounter = (WLANHAL_RX_BD_GET_PMICMD_24TO25(pucRxBDHeader) & 0x0000FFFF);
- ullcurrentReplayCounter <<= 32;
- ullcurrentReplayCounter |= WLANHAL_RX_BD_GET_PMICMD_20TO23(pucRxBDHeader);
- return ullcurrentReplayCounter;
-#endif
-
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/*==========================================================================
FUNCTION WDA_DS_TxFrames
@@ -1485,9 +1010,7 @@
return vosStatus;
}
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
/*==========================================================================
FUNCTION WDA_DS_TxFlowControlCallback
@@ -1572,7 +1095,6 @@
}
}
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
/*==========================================================================
FUNCTION WDA_DS_GetTxFlowMask
@@ -1605,7 +1127,6 @@
v_U8_t* puFlowMask
)
{
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
tWDA_CbContext* wdaContext = NULL;
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
@@ -1630,13 +1151,8 @@
*puFlowMask = wdaContext->uTxFlowMask;
return VOS_STATUS_SUCCESS;
-#else
- *puFlowMask = WDA_TXFLOWMASK;
- return VOS_STATUS_SUCCESS;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
}
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
v_VOID_t
WDA_DS_TxCompleteCB
(
@@ -1678,4 +1194,3 @@
wdaContext->pfnTxCompleteCallback( pvosGCtx, pFrameDataBuff, vosStatus );
}
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
diff --git a/CORE/WDA/src/wlan_qct_wda_legacy.c b/CORE/WDA/src/wlan_qct_wda_legacy.c
index d9e890e..6ea48dc 100644
--- a/CORE/WDA/src/wlan_qct_wda_legacy.c
+++ b/CORE/WDA/src/wlan_qct_wda_legacy.c
@@ -39,7 +39,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-
/*===========================================================================
wlan_qct_wda_legacy.c
@@ -151,69 +150,6 @@
return rc;
} // halMntPostMsg()
-#ifndef FEATURE_WLAN_INTEGRATED_SOC
-#if defined(ANI_MANF_DIAG) || defined(ANI_PHY_DEBUG)
-#include "pttModuleApi.h"
-// -------------------------------------------------------------
-/**
- * halNimPTTPostMsgApi
- *
- * FUNCTION:
- * Posts NIM messages to gNIM thread
- *
- * LOGIC:
- *
- * ASSUMPTIONS:pl
- *
- *
- * NOTE:
- *
- * @param tpAniSirGlobal MAC parameters structure
- * @param pMsg pointer with message
- * @return Success or Failure
- */
-
-tSirRetStatus
-halNimPTTPostMsgApi(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
-{
- tSirRetStatus rc = eSIR_SUCCESS;
-
- do
- {
-#ifdef ANI_OS_TYPE_RTAI_LINUX
-
- // Posts message to the queue
- if (tx_queue_send(&pMac->sys.gSirNimRDMsgQ, pMsg,
- TX_NO_WAIT) != TX_SUCCESS)
- {
- rc = eSIR_FAILURE;
- wdaLog(pMac, LOGP,
- FL("Posting a Msg to nimMsgQ failed!\n"));
- break;
- }
-#else
- // For Windows based MAC, instead of posting message to different
- // queues, we will call the handler routines directly
- wdaLog(pMac, LOGE, "ERROR: Received PTT message in obsolete code path.\n");
- wdaLog(pMac, LOGP, "This indicates that the wrong OID is being used - clean registry and previous inf files.\n");
- /*
- tPttMsgbuffer *msgPtr = (tPttMsgbuffer *)(pMsg->body); //for some reason, body is actually being used as if it were a void *
- pttProcessMsg(pMac, msgPtr);
- */
-
- //TODO: the resonse is now packaged in ((tPttMsgbuffer *)&pMsg->body)->msgResponse and needs to be sent back to the application
-
- rc = eSIR_SUCCESS;
-#endif
- }
- while (0);
-
- return rc;
-} // halNimPTTPostMsgApi()
-
-
-#endif //ANI_MANF_DIAG
-#endif //FEATURE_WLAN_INTEGRATED_SOC
// -------------------------------------------------------------
/**
@@ -296,9 +232,6 @@
#if defined(ANI_MANF_DIAG) || defined(ANI_PHY_DEBUG)
case SIR_PTT_MSG_TYPES_BEGIN:
-#ifndef FEATURE_WLAN_INTEGRATED_SOC
- halNimPTTPostMsgApi(pMac, &msg); // Posts a message to the NIM PTT MsgQ
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
break;
#endif