qcacld-3.0: Fix clang warnings implicit enum type tAniBool
warning: implicit conversion from enumeration type 'tAniBool'
(aka 'enum eAniBool') to different enumeration type
'eSapBool' [-Wenum-conversion]
Replace tAniBool/eSapBool with bool.
Change-Id: I919488d2accc094049375fffe8b54a5d7dea621e
CRs-Fixed: 2055487
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index ae8dc5b..f24a80f 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -3448,7 +3448,7 @@
hdd_debug("MIC MAC " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg.src_addr.sa_data));
- if (pRoamInfo->u.pMICFailureInfo->multicast == eSIR_TRUE)
+ if (pRoamInfo->u.pMICFailureInfo->multicast == true)
msg.flags = IW_MICFAILURE_GROUP;
else
msg.flags = IW_MICFAILURE_PAIRWISE;
@@ -3462,7 +3462,7 @@
taMacAddr,
((pRoamInfo->u.pMICFailureInfo->
multicast ==
- eSIR_TRUE) ?
+ true) ?
NL80211_KEYTYPE_GROUP :
NL80211_KEYTYPE_PAIRWISE),
pRoamInfo->u.pMICFailureInfo->
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 1968d35..f3e2cfc 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -1496,7 +1496,7 @@
hdd_debug("MIC MAC " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg.src_addr.sa_data));
if (pSapEvent->sapevt.sapStationMICFailureEvent.
- multicast == eSAP_TRUE)
+ multicast == true)
msg.flags = IW_MICFAILURE_GROUP;
else
msg.flags = IW_MICFAILURE_PAIRWISE;
@@ -1513,7 +1513,7 @@
((pSapEvent->sapevt.
sapStationMICFailureEvent.
multicast ==
- eSAP_TRUE) ?
+ true) ?
NL80211_KEYTYPE_GROUP :
NL80211_KEYTYPE_PAIRWISE),
pSapEvent->sapevt.
diff --git a/core/mac/inc/ani_system_defs.h b/core/mac/inc/ani_system_defs.h
index 4d5796e..2e228a5 100644
--- a/core/mac/inc/ani_system_defs.h
+++ b/core/mac/inc/ani_system_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -63,12 +63,6 @@
#define true 1
#endif
-typedef enum eAniBool {
- eSIR_FALSE,
- eSIR_TRUE,
- eSIR_DONOT_USE_BOOL = SIR_MAX_ENUM_SIZE
-} tAniBool;
-
/* / Authentication type enum used with peer */
typedef enum eAniAuthType {
eSIR_OPEN_SYSTEM,
@@ -180,7 +174,7 @@
tSirMacAddr srcMacAddr; /* address used to compute MIC */
tSirMacAddr taMacAddr; /* transmitter address */
tSirMacAddr dstMacAddr;
- tAniBool multicast;
+ bool multicast;
uint8_t IV1; /* first byte of IV */
uint8_t keyId; /* second byte of IV */
uint8_t TSC[SIR_CIPHER_SEQ_CTR_SIZE]; /* sequence number */
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 55a6a4b..b6a0a79 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1166,15 +1166,15 @@
tAniEdType MgmtEncryptionType;
#endif
- tAniBool is11Rconnection;
+ bool is11Rconnection;
#ifdef FEATURE_WLAN_ESE
- tAniBool isESEFeatureIniEnabled;
- tAniBool isESEconnection;
+ bool isESEFeatureIniEnabled;
+ bool isESEconnection;
tESETspecInfo eseTspecInfo;
#endif
- tAniBool isFastTransitionEnabled;
- tAniBool isFastRoamIniFeatureEnabled;
+ bool isFastTransitionEnabled;
+ bool isFastRoamIniFeatureEnabled;
uint8_t txLdpcIniFeatureEnabled;
tSirHTConfig htConfig;
@@ -1190,11 +1190,11 @@
bool send_smps_action;
uint8_t max_amsdu_num;
- tAniBool isWMEenabled;
- tAniBool isQosEnabled;
- tAniBool isOSENConnection;
+ bool isWMEenabled;
+ bool isQosEnabled;
+ bool isOSENConnection;
struct rrm_config_param rrm_config;
- tAniBool spectrumMgtIndicator;
+ bool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
bool enable_bcast_probe_rsp;
@@ -1310,11 +1310,11 @@
/* powerCap & supportedChannels are present only when */
/* spectrumMgtIndicator flag is set */
- tAniBool spectrumMgtIndicator;
+ bool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
- tAniBool wmmEnabledSta; /* if present - STA is WMM enabled */
- tAniBool reassocReq;
+ bool wmmEnabledSta; /* if present - STA is WMM enabled */
+ bool reassocReq;
/* Required for indicating the frames to upper layer */
uint32_t beaconLength;
uint8_t *beaconPtr;
@@ -1897,8 +1897,8 @@
uint16_t msgType; /* message type is same as the request type */
uint16_t msgLen; /* length of the entire request */
uint8_t countryCode[WNI_CFG_COUNTRY_CODE_LEN]; /* 3 char country code */
- tAniBool countryFromUserSpace;
- tAniBool sendRegHint; /* true if we want to send hint to NL80211 */
+ bool countryFromUserSpace;
+ bool sendRegHint; /* true if we want to send hint to NL80211 */
void *changeCCCallback;
void *pDevContext; /* device context */
void *p_cds_context; /* cds context */
diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h
index c8fe42c..a1d37e6 100644
--- a/core/mac/src/pe/include/lim_session.h
+++ b/core/mac/src/pe/include/lim_session.h
@@ -292,14 +292,14 @@
int8_t maxTxPower; /* MIN (Regulatory and local power constraint) */
enum tQDF_ADAPTER_MODE pePersona;
int8_t txMgmtPower;
- tAniBool is11Rconnection;
+ bool is11Rconnection;
#ifdef FEATURE_WLAN_ESE
- tAniBool isESEconnection;
+ bool isESEconnection;
tEsePEContext eseContext;
#endif
- tAniBool isFastTransitionEnabled;
- tAniBool isFastRoamIniFeatureEnabled;
+ bool isFastTransitionEnabled;
+ bool isFastRoamIniFeatureEnabled;
tSirNoAParam p2pNoA;
tSirP2PNoaAttr p2pGoPsUpdate;
uint32_t defaultAuthFailureTimeout;
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 871ca60..260fffb 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -1354,34 +1354,34 @@
* @param pBeacon - Parsed Beacon Frame structure
* @param pSession - Pointer to the PE session
*
- * @return eSIR_TRUE if encryption type is matched; eSIR_FALSE otherwise
+ * @return true if encryption type is matched; false otherwise
*/
-static tAniBool lim_ibss_enc_type_matched(tpSchBeaconStruct pBeacon,
+static bool lim_ibss_enc_type_matched(tpSchBeaconStruct pBeacon,
tpPESession pSession)
{
if (!pBeacon || !pSession)
- return eSIR_FALSE;
+ return false;
/* Open case */
if (pBeacon->capabilityInfo.privacy == 0
&& pSession->encryptType == eSIR_ED_NONE)
- return eSIR_TRUE;
+ return true;
/* WEP case */
if (pBeacon->capabilityInfo.privacy == 1 && pBeacon->wpaPresent == 0
&& pBeacon->rsnPresent == 0
&& (pSession->encryptType == eSIR_ED_WEP40
|| pSession->encryptType == eSIR_ED_WEP104))
- return eSIR_TRUE;
+ return true;
/* WPA-None case */
if (pBeacon->capabilityInfo.privacy == 1 && pBeacon->wpaPresent == 1
&& pBeacon->rsnPresent == 0
&& ((pSession->encryptType == eSIR_ED_CCMP) ||
(pSession->encryptType == eSIR_ED_TKIP)))
- return eSIR_TRUE;
+ return true;
- return eSIR_FALSE;
+ return false;
}
/**
@@ -1424,7 +1424,7 @@
lim_cmp_ssid(&pBeacon->ssId, psessionEntry) ||
(psessionEntry->currentOperChannel != pBeacon->channelNumber))
retCode = eSIR_LIM_IGNORE_BEACON;
- else if (lim_ibss_enc_type_matched(pBeacon, psessionEntry) != eSIR_TRUE) {
+ else if (lim_ibss_enc_type_matched(pBeacon, psessionEntry) != true) {
pe_debug("peer privacy: %d peer wpa: %d peer rsn: %d self encType: %d",
pBeacon->capabilityInfo.privacy,
pBeacon->wpaPresent, pBeacon->rsnPresent,
diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
index 970533b..d13d49a 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c
@@ -2192,7 +2192,7 @@
/* Fill in 802.11h related info */
if (assoc_req->powerCapabilityPresent
&& assoc_req->supportedChannelsPresent) {
- assoc_ind->spectrumMgtIndicator = eSIR_TRUE;
+ assoc_ind->spectrumMgtIndicator = true;
assoc_ind->powerCap.minTxPower =
assoc_req->powerCapability.minTxPower;
assoc_ind->powerCap.maxTxPower =
@@ -2200,7 +2200,7 @@
lim_convert_supported_channels(mac_ctx, assoc_ind,
assoc_req);
} else {
- assoc_ind->spectrumMgtIndicator = eSIR_FALSE;
+ assoc_ind->spectrumMgtIndicator = false;
}
/* This check is to avoid extra Sec IEs present incase of WPS */
diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c
index 71bd8a0..090f982 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -281,7 +281,7 @@
if (sta_ds_ptr) {
tLimMlmDisassocReq *pMlmDisassocReq = NULL;
tLimMlmDeauthReq *pMlmDeauthReq = NULL;
- tAniBool isConnected = eSIR_TRUE;
+ bool isConnected = true;
pMlmDisassocReq =
mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq;
@@ -294,7 +294,7 @@
MAC_ADDR_ARRAY(
pMlmDisassocReq->peer_macaddr.bytes));
lim_process_disassoc_ack_timeout(mac_ctx);
- isConnected = eSIR_FALSE;
+ isConnected = false;
}
pMlmDeauthReq =
mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq;
@@ -307,7 +307,7 @@
MAC_ADDR_ARRAY(
pMlmDeauthReq->peer_macaddr.bytes));
lim_process_deauth_ack_timeout(mac_ctx);
- isConnected = eSIR_FALSE;
+ isConnected = false;
}
/*
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index 2dcbe8b..f63f074 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -878,7 +878,7 @@
tpSirMacMgmtHdr pHdr = NULL;
tpPESession psessionEntry = NULL;
uint8_t sessionId;
- tAniBool isFrmFt = false;
+ bool isFrmFt = false;
*pDeferMsg = false;
lim_get_b_dfrom_rx_packet(pMac, limMsg->bodyptr,
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 70d435a..fda7024 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -756,7 +756,7 @@
/* Copy the new TITAN capabilities */
sme_assoc_ind->spectrumMgtIndicator = assoc_ind->spectrumMgtIndicator;
- if (assoc_ind->spectrumMgtIndicator == eSIR_TRUE) {
+ if (assoc_ind->spectrumMgtIndicator == true) {
sme_assoc_ind->powerCap.minTxPower =
assoc_ind->powerCap.minTxPower;
sme_assoc_ind->powerCap.maxTxPower =
diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c
index b3d109d..655c533 100644
--- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c
+++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c
@@ -142,7 +142,7 @@
LIM_BSS_CAPS_GET(WSM, pe_session->limReassocBssQosCaps);
if (pe_session->lim11hEnable &&
- pe_session->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) {
+ pe_session->pLimReAssocReq->spectrumMgtIndicator == true) {
power_caps_populated = true;
populate_dot11f_power_caps(mac_ctx, &frm.PowerCaps,
@@ -604,7 +604,7 @@
LIM_BSS_CAPS_GET(WSM, psessionEntry->limReassocBssQosCaps);
if (psessionEntry->lim11hEnable &&
- psessionEntry->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) {
+ psessionEntry->pLimReAssocReq->spectrumMgtIndicator == true) {
PowerCapsPopulated = true;
populate_dot11f_power_caps(pMac, &frm.PowerCaps, LIM_REASSOC,
psessionEntry);
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index bdffb96..15b8355 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -1716,7 +1716,7 @@
LIM_BSS_CAPS_GET(WSM, pe_session->limCurrentBssQosCaps);
if (pe_session->lim11hEnable &&
- pe_session->pLimJoinReq->spectrumMgtIndicator == eSIR_TRUE) {
+ pe_session->pLimJoinReq->spectrumMgtIndicator == true) {
power_caps = true;
populate_dot11f_power_caps(mac_ctx, &frm->PowerCaps,
diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h
index 9c50a84..72c8658 100644
--- a/core/mac/src/pe/lim/lim_types.h
+++ b/core/mac/src/pe/lim/lim_types.h
@@ -253,12 +253,12 @@
tSirWAPIie wapiIE;
tSirAddie addIE; /* additional IE received from the peer, which possibly includes WSC IE and/or P2P IE. */
tSirMacCapabilityInfo capabilityInfo;
- tAniBool spectrumMgtIndicator;
+ bool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
uint8_t sessionId;
- tAniBool WmmStaInfoPresent;
+ bool WmmStaInfoPresent;
/* Required for indicating the frames to upper layer */
uint32_t beaconLength;
@@ -292,11 +292,11 @@
tSirWAPIie wapiIE;
tSirAddie addIE; /* additional IE received from the peer, which can be WSC IE and/or P2P IE. */
tSirMacCapabilityInfo capabilityInfo;
- tAniBool spectrumMgtIndicator;
+ bool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
- tAniBool WmmStaInfoPresent;
+ bool WmmStaInfoPresent;
/* Required for indicating the frames to upper layer */
uint32_t beaconLength;
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 2c9a435..e94c931 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -4930,7 +4930,7 @@
* @param channel - New channel to which we are expected to move
* @return None
*/
-tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t channel)
+bool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t channel)
{
uint8_t index;
uint32_t validChannelListLen = WNI_CFG_VALID_CHANNEL_LIST_LEN;
@@ -4941,16 +4941,16 @@
(uint32_t *) &validChannelListLen) !=
eSIR_SUCCESS) {
pe_err("could not retrieve valid channel list");
- return eSIR_FALSE;
+ return false;
}
for (index = 0; index < validChannelListLen; index++) {
if (validChannelList[index] == channel)
- return eSIR_TRUE;
+ return true;
}
/* channel does not belong to list of valid channels */
- return eSIR_FALSE;
+ return false;
}
/**------------------------------------------------------
diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h
index 645059d..17c9187 100644
--- a/core/mac/src/pe/lim/lim_utils.h
+++ b/core/mac/src/pe/lim/lim_utils.h
@@ -247,7 +247,7 @@
void lim_cancel_dot11h_channel_switch(tpAniSirGlobal pMac,
tpPESession psessionEntry);
void lim_cancel_dot11h_quiet(tpAniSirGlobal pMac, tpPESession psessionEntry);
-tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac,
+bool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac,
uint8_t channel);
void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type,
tLimControlTx mode);
diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h
index c245082..c3eb015 100644
--- a/core/sap/inc/sap_api.h
+++ b/core/sap/inc/sap_api.h
@@ -201,12 +201,6 @@
eSAP_USR_INITATED_DISASSOC
} eSapDisassocReason;
-/*Handle bool over here*/
-typedef enum {
- eSAP_FALSE,
- eSAP_TRUE,
-} eSapBool;
-
typedef enum {
eSAP_DFS_NOL_CLEAR,
eSAP_DFS_NOL_RANDOMIZE,
@@ -313,7 +307,7 @@
struct qdf_mac_addr srcMacAddr; /* address used to compute MIC */
struct qdf_mac_addr staMac; /* taMacAddr transmitter address */
struct qdf_mac_addr dstMacAddr;
- eSapBool multicast;
+ bool multicast;
uint8_t IV1; /* first byte of IV */
uint8_t keyId; /* second byte of IV */
uint8_t TSC[SIR_CIPHER_SEQ_CTR_SIZE]; /* sequence number */
diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c
index cb0c236..9ca306c 100644
--- a/core/sap/src/sap_api_link_cntl.c
+++ b/core/sap/src/sap_api_link_cntl.c
@@ -568,7 +568,7 @@
* beacon template will be cleared by now. A new beacon template
* with no CSA IE will be sent to firmware.
*/
- dfs_beacon_start_req = eSAP_TRUE;
+ dfs_beacon_start_req = true;
sap_ctx->pre_cac_complete = false;
*ret_status = sme_roam_start_beacon_req(hHal, sap_ctx->bssid,
dfs_beacon_start_req);
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index eb8022f..0535060 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -587,7 +587,7 @@
if (pSpectCh == NULL) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"In %s, QDF_MALLOC_ERR", __func__);
- return eSAP_FALSE;
+ return false;
}
/* Initialize the pointers in the DfsParams to the allocated memory */
@@ -658,12 +658,12 @@
if (true == chSafe) {
pSpectCh->chNum = *pChans;
- pSpectCh->valid = eSAP_TRUE;
+ pSpectCh->valid = true;
pSpectCh->rssiAgr = SOFTAP_MIN_RSSI; /* Initialise for all channels */
pSpectCh->channelWidth = SOFTAP_HT20_CHANNELWIDTH; /* Initialise 20MHz for all the Channels */
}
}
- return eSAP_TRUE;
+ return true;
}
/*==========================================================================
@@ -2084,12 +2084,12 @@
static bool sap_filter_over_lap_ch(ptSapContext pSapCtx, uint16_t chNum)
{
if (pSapCtx->enableOverLapCh)
- return eSAP_TRUE;
+ return true;
else if ((chNum == CHANNEL_1) ||
(chNum == CHANNEL_6) || (chNum == CHANNEL_11))
- return eSAP_TRUE;
+ return true;
- return eSAP_FALSE;
+ return false;
}
#ifdef FEATURE_WLAN_CH_AVOID
@@ -2238,7 +2238,7 @@
}
/* Initialize the structure pointed by spect_info */
- if (sap_chan_sel_init(hal, spect_info, sap_ctx) != eSAP_TRUE) {
+ if (sap_chan_sel_init(hal, spect_info, sap_ctx) != true) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("Ch Select initialization failed"));
return SAP_CHANNEL_NOT_SELECTED;
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index 670ecfc..ae85004 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -3824,7 +3824,7 @@
}
}
-eSapBool
+bool
sap_search_mac_list(struct qdf_mac_addr *macList,
uint8_t num_mac, uint8_t *peerMac,
uint8_t *index)
@@ -3836,7 +3836,7 @@
if ((NULL == macList) || (num_mac > MAX_ACL_MAC_ADDRESS)) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("either buffer is NULL or size = %d is more."), num_mac);
- return eSAP_FALSE;
+ return false;
}
while (nStart <= nEnd) {
@@ -3856,7 +3856,7 @@
QDF_TRACE_LEVEL_INFO_HIGH, "index %d",
*index);
}
- return eSAP_TRUE;
+ return true;
}
if (nRes < 0)
nStart = nMiddle + 1;
@@ -3866,7 +3866,7 @@
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"search not succ");
- return eSAP_FALSE;
+ return false;
}
void sap_add_mac_to_acl(struct qdf_mac_addr *macList,
@@ -4088,9 +4088,9 @@
* - DFS scan enabled and chan not in CHANNEL_STATE_DISABLE
* - DFS scan disable but chan in CHANNEL_STATE_ENABLE
*/
- if (!(((eSAP_TRUE == mac_ctx->scan.fEnableDFSChnlScan) &&
+ if (!(((true == mac_ctx->scan.fEnableDFSChnlScan) &&
wlan_reg_get_channel_state(mac_ctx->pdev, loop_count)) ||
- ((eSAP_FALSE == mac_ctx->scan.fEnableDFSChnlScan) &&
+ ((false == mac_ctx->scan.fEnableDFSChnlScan) &&
(CHANNEL_STATE_ENABLE ==
wlan_reg_get_channel_state(mac_ctx->pdev, loop_count)))))
continue;
@@ -4199,7 +4199,7 @@
* if the radar is found in the STARTED state
*/
if (eSAP_STARTED == sap_ctx->sapsMachine)
- mac->sap.SapDfsInfo.csaIERequired = eSAP_TRUE;
+ mac->sap.SapDfsInfo.csaIERequired = true;
if (sap_ctx->csr_roamProfile.disableDFSChSwitch)
return sap_ctx->channel;
diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h
index 02b4b79..0116e47 100644
--- a/core/sap/src/sap_internal.h
+++ b/core/sap/src/sap_internal.h
@@ -368,7 +368,7 @@
void
sap_print_acl(struct qdf_mac_addr *macList, uint8_t size);
-eSapBool
+bool
sap_search_mac_list(struct qdf_mac_addr *macList, uint8_t num_mac,
uint8_t *peerMac, uint8_t *index);
diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index 2bba08a..55d2e24 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -1300,7 +1300,7 @@
wlansap_modify_acl
(void *ctx,
uint8_t *peer_sta_mac, eSapACLType list_type, eSapACLCmdType cmd) {
- eSapBool sta_white_list = eSAP_FALSE, sta_black_list = eSAP_FALSE;
+ bool sta_white_list = false, sta_black_list = false;
uint8_t staWLIndex, staBLIndex;
ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx);
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index 6f31f71..a735a3d 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -443,8 +443,8 @@
uint8_t *pCountry,
void *pContext,
void *p_cds_context,
- tAniBool countryFromUserSpace,
- tAniBool sendRegHint);
+ bool countryFromUserSpace,
+ bool sendRegHint);
QDF_STATUS sme_generic_change_country_code(tHalHandle hHal,
uint8_t *pCountry);
QDF_STATUS sme_tx_fail_monitor_start_stop_ind(tHalHandle hHal,
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 09a7a90..b275929 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -5059,8 +5059,8 @@
uint8_t *pCountry,
void *pContext,
void *p_cds_context,
- tAniBool countryFromUserSpace,
- tAniBool sendRegHint)
+ bool countryFromUserSpace,
+ bool sendRegHint)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 752d58b..7338c08 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -14046,7 +14046,7 @@
uint8_t txBFCsnValue = 0;
tSirSmeJoinReq *csr_join_req;
tSirMacCapabilityInfo *pAP_capabilityInfo;
- tAniBool fTmp;
+ bool fTmp;
int8_t pwrLimit = 0;
struct ps_global_info *ps_global_info = &pMac->sme.ps_global_info;
struct ps_params *ps_param = &ps_global_info->ps_params[sessionId];
@@ -14656,9 +14656,9 @@
*/
if (csr_is11h_supported(pMac) && pAP_capabilityInfo->spectrumMgt
&& eSIR_11A_NW_TYPE == pBssDescription->nwType) {
- fTmp = (tAniBool) 1;
+ fTmp = true;
} else
- fTmp = (tAniBool) 0;
+ fTmp = false;
csr_join_req->spectrumMgtIndicator = fTmp;
csr_join_req->powerCap.minTxPower = MIN_TX_PWR_CAP;