wlan: mac: 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: Ia13e7c2d1b1300bb1cfb528e122a5c5d736a2a4c
CRs-fixed: 452041
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index 9921c53..0ffe82a 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -76,15 +76,8 @@
#include "utilsGlobal.h"
#include "sirApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halGlobal.h"
-#include "halDataStruct.h"
-#include "pttModule.h"
-#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#include "wlan_qct_hal.h"
-#endif
#ifdef ANI_PRODUCT_TYPE_CLIENT
#include "pmc.h"
@@ -128,11 +121,9 @@
// New HAL API interface defs.
#include "logDump.h"
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
//Check if this definition can actually move here from halInternal.h even for Volans. In that case
//this featurization can be removed.
#define PMAC_STRUCT( _hHal ) ( (tpAniSirGlobal)_hHal )
-#endif
#define ANI_DRIVER_TYPE(pMac) (((tpAniSirGlobal)(pMac))->gDriverType)
// -------------------------------------------------------------------
@@ -996,7 +987,6 @@
} tftContext, *tpFTContext;
#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
//Check if this definition can actually move here even for Volans. In that case
//this featurization can be removed.
/** ------------------------------------------------------------------------- *
@@ -1046,7 +1036,6 @@
tDriverType driverType;
} tHalMacStartParameters;
-#endif
// -------------------------------------------------------------------
/// MAC Sirius parameter structure
@@ -1076,9 +1065,6 @@
tAniSirUtils utils;
#ifndef WLAN_FTM_STUB
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
- tPttModuleVariables ptt;
-#endif
#endif
tAniSirTxWrapper txWrapper;
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 382b6e6..1c7622c 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -1184,7 +1184,6 @@
#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
/// Definition for Join/Reassoc info - Reshmi: need to check if this is a def which moved from elsehwere.
typedef struct sJoinReassocInfo
{
@@ -1193,7 +1192,6 @@
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
} tJoinReassocInfo, *tpJoinReassocInfo;
-#endif
/// Definition for join request
/// ---> MAC
@@ -3821,7 +3819,6 @@
}tSirNoAParam, *tpSirNoAParam;
#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
typedef struct sSirWlanSuspendParam
{
tANI_U8 configuredMcstBcstFilterSetting;
@@ -3837,7 +3834,6 @@
tANI_U8 configuredMcstBcstFilterSetting;
tANI_U8 setMcstBcstFilter;
}tSirWlanSetRxpFilters,*tpSirWlanSetRxpFilters;
-#endif
#ifdef FEATURE_WLAN_SCAN_PNO
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index 6c555a1..39e56ed 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -160,21 +160,17 @@
eWNI_SME_STOP_BSS_REQ,
eWNI_SME_STOP_BSS_RSP,
eWNI_SME_DEL_BA_PEER_IND,
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
eWNI_SME_DEFINE_QOS_REQ,
eWNI_SME_DEFINE_QOS_RSP,
eWNI_SME_DELETE_QOS_REQ,
eWNI_SME_DELETE_QOS_RSP,
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
eWNI_SME_PROMISCUOUS_MODE_REQ,
eWNI_SME_PROMISCUOUS_MODE_RSP,
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
eWNI_SME_LINK_TEST_START_REQ,
eWNI_SME_LINK_TEST_START_RSP,
eWNI_SME_LINK_TEST_STOP_REQ,
eWNI_SME_LINK_TEST_STOP_RSP,
eWNI_SME_LINK_TEST_REPORT_IND,
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
eWNI_SME_NEIGHBOR_BSS_IND,
eWNI_SME_MEASUREMENT_REQ,
eWNI_SME_MEASUREMENT_RSP,
@@ -182,7 +178,6 @@
eWNI_SME_SET_WDS_INFO_REQ,
eWNI_SME_SET_WDS_INFO_RSP,
eWNI_SME_WDS_INFO_IND,
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
eWNI_SME_SET_POWER_REQ,
eWNI_SME_SET_POWER_RSP,
eWNI_SME_CLIENT_SIDE_LOAD_BALANCE_REQ,
@@ -192,7 +187,6 @@
eWNI_SME_SET_PROPRIETARY_IE_REQ,
eWNI_SME_SET_PROPRIETARY_IE_RSP, // #endif
eWNI_SME_DISCARD_SKB_NTF, // Used to cleanup SKBs by HDD
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
eWNI_SME_DEAUTH_CNF,
eWNI_SME_MIC_FAILURE_IND,
eWNI_SME_ADDTS_REQ,
@@ -431,14 +425,12 @@
/* excluding variable data length */
/*---------------------------------------------------------------------*/
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
// Parameter update indication
#define WNI_CFG_PARAM_UPDATE_IND_PID 0
#define WNI_CFG_PARAM_UPDATE_IND_NUM 1
#define WNI_CFG_PARAM_UPDATE_IND_LEN (WNI_CFG_MB_HDR_LEN + \
(WNI_CFG_PARAM_UPDATE_IND_NUM << 2))
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
// Configuration download request
#define WNI_CFG_DNLD_REQ_NUM 0
diff --git a/CORE/MAC/src/dph/dphHashTable.c b/CORE/MAC/src/dph/dphHashTable.c
index 03bc47e..3772f8b 100644
--- a/CORE/MAC/src/dph/dphHashTable.c
+++ b/CORE/MAC/src/dph/dphHashTable.c
@@ -58,13 +58,8 @@
#include "dphGlobal.h"
#include "limDebug.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#include "halMsgApi.h"
-#endif
// ---------------------------------------------------------------------
/**
diff --git a/CORE/MAC/src/include/dphGlobal.h b/CORE/MAC/src/include/dphGlobal.h
index 6ae047f..d57b1ef 100644
--- a/CORE/MAC/src/include/dphGlobal.h
+++ b/CORE/MAC/src/include/dphGlobal.h
@@ -262,7 +262,6 @@
} tDphQueueAttr, *tpDphQueueAttr;
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
typedef struct sCfgTrafficClass {
@@ -325,7 +324,6 @@
} tCfgTrafficClass;
-#endif /* EATURE_WLAN_INTEGRATED_SOC */
/// STA state node
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index 0cea47c..3248df4 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -66,7 +66,6 @@
#define SIR_MAX_NUM_STA_IN_IBSS 16
#define SIR_MAX_NUM_STA_IN_BSS 256
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
typedef enum
{
PHY_SINGLE_CHANNEL_CENTERED = 0, // 20MHz IF bandwidth centered on IF carrier
@@ -83,7 +82,6 @@
#endif
PHY_CHANNEL_BONDING_STATE_MAX = 11
}ePhyChanBondState;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
#define SIR_MIN(a,b) (((a) < (b)) ? (a) : (b))
#define SIR_MAX(a,b) (((a) > (b)) ? (a) : (b))
@@ -513,10 +511,8 @@
#define SIR_HAL_SET_LINK_STATE_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 165)
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#define SIR_HAL_WLAN_SUSPEND_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 166)
#define SIR_HAL_WLAN_RESUME_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 167)
-#endif
/// PE <-> HAL Keep Alive message
#define SIR_HAL_SET_KEEP_ALIVE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 168)
diff --git a/CORE/MAC/src/pe/include/limApi.h b/CORE/MAC/src/pe/include/limApi.h
index f4e2947..dcdf065 100644
--- a/CORE/MAC/src/pe/include/limApi.h
+++ b/CORE/MAC/src/pe/include/limApi.h
@@ -66,9 +66,7 @@
#include "utilsApi.h"
#include "limGlobal.h"
#include "halMsgApi.h"
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#include "wlan_qct_wdi_ds.h"
-#endif
#include "wlan_qct_wda.h"
#define LIM_POL_SYS_SCAN_MODE 0
#define LIM_POL_SYS_LEARN_MODE 1
@@ -126,9 +124,7 @@
extern tSirRetStatus limInitialize(tpAniSirGlobal);
tSirRetStatus peOpen(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam);
tSirRetStatus peClose(tpAniSirGlobal pMac);
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
tSirRetStatus limStart(tpAniSirGlobal pMac);
-#endif
/**
* Function to Initialize radar interrupts.
*/
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 071b9cb..debc86b 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -269,19 +269,10 @@
pMac->lim.gLimHalScanState = eLIM_HAL_IDLE_SCAN_STATE;
#endif // GEN4_SCAN
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
/**
* Initialize state to eLIM_SME_OFFLINE_STATE
*/
pMac->lim.gLimSmeState = eLIM_SME_OFFLINE_STATE;
-#else
- /**
- * Initialize state to suspended state and wait for
- * HAL to send LIM_RESUME_ACTIVITY_NTF message.
- */
- MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, NO_SESSION, pMac->lim.gLimSmeState));
- pMac->lim.gLimSmeState = eLIM_SME_SUSPEND_STATE;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
/**
* By default assume 'unknown' role. This will be updated
@@ -469,7 +460,6 @@
pMac->lim.gAddBA_Declined = 0; // Flag to Decline the BAR if the particular bit (0-7) is being set
}
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
static tSirRetStatus __limInitConfig( tpAniSirGlobal pMac )
{
tANI_U32 val1, val2, val3;
@@ -652,7 +642,6 @@
return eSIR_SUCCESS;
}
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
/*
limStart
@@ -729,13 +718,11 @@
__limInitHTVars(pMac);
__limInitTitanVars(pMac);
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
status = limStart(pMac);
if(eSIR_SUCCESS != status)
{
return status;
}
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
/*
* MLM will be intitalized when 'START' request comes from SME.
@@ -790,7 +777,6 @@
#endif
MTRACE(limTraceInit(pMac));
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
//Initialize the configurations needed by PE
if( eSIR_FAILURE == __limInitConfig(pMac))
{
@@ -804,7 +790,6 @@
//Now, DAL is started before PE so this can be done here
limAdmitControlInit(pMac);
limRegisterHalIndCallBack(pMac);
-#endif /*FEATURE_WLAN_INTEGRATED_SOC*/
return status;
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index ddf06cf..51004d2 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -2012,14 +2012,6 @@
if ((tempRateSet2.rate[i] & 0x7F) ==
(tempRateSet.rate[j] & 0x7F))
{
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
- if ((bRateIndex > HAL_NUM_11B_RATES) || (aRateIndex > HAL_NUM_11A_RATES))
- {
- limLog(pMac, LOGE, FL("Invalid number of rates (11b->%d, 11a->%d)\n"),
- bRateIndex, aRateIndex);
- return eSIR_FAILURE;
- }
-#endif
if (sirIsArate(tempRateSet2.rate[i] & 0x7f))
{
isArate=1;
diff --git a/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c b/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
index a40a6f0..0fa777a 100644
--- a/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
+++ b/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
@@ -56,10 +56,6 @@
#include "wniCfgAp.h"
#include "cfgApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#include "halCommonApi.h"
-#endif
#include "schApi.h"
#include "pmmApi.h"
diff --git a/CORE/MAC/src/pe/lim/limLogDump.c b/CORE/MAC/src/pe/lim/limLogDump.c
index 61cde72..546c8e9 100644
--- a/CORE/MAC/src/pe/lim/limLogDump.c
+++ b/CORE/MAC/src/pe/lim/limLogDump.c
@@ -1406,11 +1406,6 @@
{
/* FIXME: NO HAL IN UMAC for PRIMA */
-#if !defined( FEATURE_WLAN_INTEGRATED_SOC )
- // Call HAL API to trigger deletion of BA due to timeout
- (void)halMsg_PostBADeleteInd( pMac, (tANI_U16) arg1, (tANI_U8) arg2, (tANI_U8) arg3,
- HAL_BA_ERR_TIMEOUT );
-#endif
p += log_sprintf( pMac, p,
"\n%s: Attempted to trigger a BA Timeout Ind to STA Index %d, for TID %d, Direction %d\n",
@@ -2214,19 +2209,6 @@
case 5:
{
// FIXME.
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
- tDot11fLinkMeasurementRequest frm;
- tHalBufDesc Bd;
- pBody[arg2][3] = (tANI_U8)arg3; //TxPower used
- pBody[arg2][4] = (tANI_U8)arg4; //Max Tx power
-
- Bd.phyStats0 = 0;
- Bd.phyStats1 = 0;
- if( (status = dot11fUnpackLinkMeasurementRequest( pMac, &pBody[arg2][0], size[arg2], &frm )) != 0 )
- p += log_sprintf( pMac, p, "failed to unpack.....status = %x\n", status);
- else
- rrmProcessLinkMeasurementRequest( pMac, (tANI_U8*)&Bd, &frm, psessionEntry );
-#endif
}
break;
case 6:
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index 947fe82..b2d6e91 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -53,9 +53,6 @@
#include "wniApi.h"
#include "sirApi.h"
#include "aniGlobal.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#endif
#if (WNI_POLARIS_FW_PRODUCT == AP)
#include "wniCfgAp.h"
#else
diff --git a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
index 232fd23..eac2e11 100755
--- a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
@@ -54,9 +54,6 @@
*/
#include "wniApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#endif
#if (WNI_POLARIS_FW_PRODUCT == AP)
#include "wniCfgAp.h"
#else
diff --git a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
index c5b4878..d1f4e90 100644
--- a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
@@ -61,9 +61,6 @@
#include "cfgApi.h"
#include "schApi.h"
#include "wniCfgAp.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#endif
#include "utilsApi.h"
#include "limTypes.h"
#include "limUtils.h"
diff --git a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
index 9a0af5f..05ebe96 100644
--- a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
+++ b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
@@ -62,9 +62,6 @@
#include "limTypes.h"
#include "limUtils.h"
#include "limPropExtsUtils.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#endif
#include "schApi.h"
#include "pmmApi.h"
#if defined WLAN_FEATURE_VOWIFI
diff --git a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
index 1513120..933061e 100644
--- a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
@@ -55,9 +55,6 @@
#include "wniApi.h"
#include "sirApi.h"
#include "aniGlobal.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#endif
#if (WNI_POLARIS_FW_PRODUCT == AP)
#include "wniCfgAp.h"
#else
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 65e8b75..5d12a6f 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -51,14 +51,9 @@
*/
#include "palTypes.h"
#include "wniApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#include "halCommonApi.h"
-#elif defined FEATURE_WLAN_INTEGRATED_SOC
#include "wlan_qct_wdi_ds.h"
#include "wlan_qct_pal_packet.h"
#include "wlan_qct_wda.h"
-#endif
#ifdef ANI_PRODUCT_TYPE_AP
#include "wniCfgAp.h"
diff --git a/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c
index df3c783..d5b3668 100644
--- a/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c
@@ -59,9 +59,6 @@
#include "wniCfgSta.h"
#endif
#include "aniGlobal.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#endif
#include "schApi.h"
#include "utilsApi.h"
#include "limApi.h"
diff --git a/CORE/MAC/src/pe/lim/limPropExtsUtils.c b/CORE/MAC/src/pe/lim/limPropExtsUtils.c
index 72a3294..31764cc 100644
--- a/CORE/MAC/src/pe/lim/limPropExtsUtils.c
+++ b/CORE/MAC/src/pe/lim/limPropExtsUtils.c
@@ -63,9 +63,6 @@
#include "sirDebug.h"
#include "utilsApi.h"
#include "cfgApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#endif
#include "limApi.h"
#include "limTypes.h"
#include "limUtils.h"
diff --git a/CORE/MAC/src/pe/lim/limSecurityUtils.c b/CORE/MAC/src/pe/lim/limSecurityUtils.c
index 3386c1a..316ad2a 100644
--- a/CORE/MAC/src/pe/lim/limSecurityUtils.c
+++ b/CORE/MAC/src/pe/lim/limSecurityUtils.c
@@ -61,10 +61,6 @@
#endif
#include "cfgApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#include "halCommonApi.h"
-#endif
#include "utilsApi.h"
#include "limUtils.h"
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 92588a8..e8fff9a 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -50,9 +50,6 @@
#include "sirApi.h"
#include "aniGlobal.h"
#include "sirMacProtDef.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#endif
#include "cfgApi.h"
#include "utilsApi.h"
#include "limTypes.h"
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index dc25d9a..677c7c4 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
@@ -64,10 +64,6 @@
#include "sysDef.h"
#include "cfgApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#include "halCommonApi.h"
-#endif
#include "schApi.h"
#include "utilsApi.h"
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index 8de45db..f775901 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -60,9 +60,7 @@
Include Files
------------------------------------------------------------------------*/
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#include "aniGlobal.h" //for tpAniSirGlobal
-#endif
#include "limTrace.h"
#include "limTimerUtils.h"
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 9812f4f..2635018 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -58,12 +58,7 @@
#include "sirMacProtDef.h"
#include "utilsApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#endif
-#ifdef FEATURE_WLAN_INTEGRATED_SOC
#include "wlan_qct_wdi_ds.h"
-#endif
#include "limApi.h"
#include "limDebug.h"
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 2756874..ee069e0 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -1511,12 +1511,8 @@
tANI_U8 qType)
{
// FIXME
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
SysProcessMmhMsg(pMac, pMsg);
return eSIR_SUCCESS;
-#else
- return(halMmhPostMsgApi(pMac, pMsg, qType));
-#endif
}
char *limFrameStr(tANI_U32 type, tANI_U32 subType)
@@ -3469,15 +3465,7 @@
MTRACE(macTraceMsgTx(pMac, psessionEntry->peSessionId, mmhMsg.type));
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
SysProcessMmhMsg(pMac, &mmhMsg);
-#else
- if(halMmhPostMsgApi(pMac, &mmhMsg, ePROT) != eSIR_SUCCESS)
- {
- palFreeMemory(pMac->hHdd, (void *)msg2Hdd);
- limLog(pMac, LOGP, FL("Message posting to HAL failed\n"));
- }
-#endif
}
/**
diff --git a/CORE/MAC/src/pe/lim/limUtils.h b/CORE/MAC/src/pe/lim/limUtils.h
index eec548e..7a0939c 100644
--- a/CORE/MAC/src/pe/lim/limUtils.h
+++ b/CORE/MAC/src/pe/lim/limUtils.h
@@ -38,7 +38,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-
/*
* Airgo Networks, Inc proprietary. All rights reserved.
* This file limUtils.h contains the utility definitions
@@ -86,7 +85,6 @@
*pCurVal = (tLimBAState)(((pSta->baState >> tid*2) & 0x3));\
}
-#if defined( FEATURE_WLAN_INTEGRATED_SOC )
typedef struct sAddBaInfo
{
tANI_U16 fBaEnable : 1;
@@ -99,7 +97,6 @@
tSirMacAddr staAddr;
tAddBaInfo baInfo[STACFG_MAX_TC];
}tAddBaCandidate, *tpAddBaCandidate;
-#endif /* FEATURE_WLAN_INTEGRATED_SOC */
// LIM utility functions
void limGetBssidFromPkt(tpAniSirGlobal, tANI_U8 *, tANI_U8 *, tANI_U32 *);
diff --git a/CORE/MAC/src/pe/rrm/rrmApi.c b/CORE/MAC/src/pe/rrm/rrmApi.c
index cd0cfa3..c5f3f34 100644
--- a/CORE/MAC/src/pe/rrm/rrmApi.c
+++ b/CORE/MAC/src/pe/rrm/rrmApi.c
@@ -62,9 +62,6 @@
#include "wniApi.h"
#include "sirApi.h"
#include "aniGlobal.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#endif
#if (WNI_POLARIS_FW_PRODUCT == AP)
#include "wniCfgAp.h"
#else
diff --git a/CORE/MAC/src/pe/sch/schApi.c b/CORE/MAC/src/pe/sch/schApi.c
index 5aca149..ef602bd 100644
--- a/CORE/MAC/src/pe/sch/schApi.c
+++ b/CORE/MAC/src/pe/sch/schApi.c
@@ -61,10 +61,6 @@
#include "sirMacPropExts.h"
#include "sirCommon.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halDataStruct.h"
-#include "halCommonApi.h"
-#endif
#include "cfgApi.h"
#include "pmmApi.h"
diff --git a/CORE/MAC/src/pe/sch/schBeaconGen.c b/CORE/MAC/src/pe/sch/schBeaconGen.c
index 38406f6..5def845 100644
--- a/CORE/MAC/src/pe/sch/schBeaconGen.c
+++ b/CORE/MAC/src/pe/sch/schBeaconGen.c
@@ -38,7 +38,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-
/*
* Airgo Networks, Inc proprietary. All rights reserved.
* This file schBeaconGen.cc contains beacon generation related
@@ -60,10 +59,6 @@
#include "limUtils.h"
#include "limApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#include "halDataStruct.h"
-#endif
#include "halMsgApi.h"
#include "cfgApi.h"
diff --git a/CORE/MAC/src/pe/sch/schBeaconProcess.c b/CORE/MAC/src/pe/sch/schBeaconProcess.c
index 1f64c1f..012d972 100644
--- a/CORE/MAC/src/pe/sch/schBeaconProcess.c
+++ b/CORE/MAC/src/pe/sch/schBeaconProcess.c
@@ -38,7 +38,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-
/*
* Airgo Networks, Inc proprietary. All rights reserved.
* This file schBeaconProcess.cc contains beacon processing related
@@ -62,9 +61,6 @@
#include "schDebug.h"
#include "schApi.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#endif
#include "limUtils.h"
#include "limSendMessages.h"
diff --git a/CORE/MAC/src/pe/sch/schMessage.c b/CORE/MAC/src/pe/sch/schMessage.c
index 2c06194..a621f46 100644
--- a/CORE/MAC/src/pe/sch/schMessage.c
+++ b/CORE/MAC/src/pe/sch/schMessage.c
@@ -38,7 +38,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-
/*
* Airgo Networks, Inc proprietary. All rights reserved.
* This file schMessage.cc contains the message handler
@@ -55,9 +54,6 @@
#include "wniCfgAp.h"
#include "aniGlobal.h"
-#ifdef FEATURE_WLAN_NON_INTEGRATED_SOC
-#include "halCommonApi.h"
-#endif
#include "cfgApi.h"
#include "limApi.h"
#include "pmmApi.h"