qcacld-3.0: Add QDF trace API's
Replace CDF trace API's with QDF trace API's.
Change-Id: I5b99dce73297f7de8f0755fa0b47dc3f84c78747
CRs-Fixed: 981188
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index 8bad430..41f4c63 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -41,7 +41,7 @@
/*--------------------------------------------------------------------------
Include Files
------------------------------------------------------------------------*/
-#include "cdf_trace.h"
+#include "qdf_trace.h"
#include "csr_api.h"
#include "sme_api.h"
#include "sap_ch_select.h"
@@ -358,8 +358,8 @@
continue;
sap_ctx->sap_detected_avoid_ch_ie.present = 1;
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_DEBUG,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_DEBUG,
"Q2Q IE - avoid ch %d",
avoid_ch_ie->channel);
/* add this channel to to_avoid channel list */
@@ -425,8 +425,8 @@
if (pSapCtx->dfs_ch_disable == true) {
if (CDS_IS_DFS_CH(safe_channels[i].channelNumber)) {
safe_channels[i].isSafe = false;
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_INFO_HIGH,
"%s: DFS Ch %d is not safe in"
" Concurrent mode",
__func__,
@@ -446,8 +446,8 @@
unsafe_channel_list[i]) {
/* Found unsafe channel, update it */
safe_channels[j].isSafe = false;
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_ERROR,
FL("CH %d is not safe"),
unsafe_channel_list[i]);
break;
@@ -460,7 +460,7 @@
#else
void sap_update_unsafe_channel_list(ptSapContext pSapCtx)
{
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: Not implemented", __func__);
return;
}
@@ -490,18 +490,18 @@
{
ptSapContext pSapCtx;
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
"Cleaning up the channel list structure");
if (NULL == p_cds_gctx) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
"SAP Global Context is NULL");
return;
}
pSapCtx = CDS_GET_SAP_CB(p_cds_gctx);
if (NULL == pSapCtx) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
"SAP Context is NULL");
return;
}
@@ -552,8 +552,8 @@
/* Select the best channel from allowed list */
for (i = 0; i < sap_ctx->acs_cfg->ch_list_count; i++) {
if (sap_ctx->acs_cfg->ch_list[i] == best_chnl) {
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_INFO_HIGH,
"Best channel is: %d",
best_chnl);
return best_chnl;
@@ -599,7 +599,7 @@
uint32_t dfs_master_cap_enabled;
bool include_dfs_ch = true;
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s",
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s",
__func__);
pSpectInfoParams->numSpectChans =
@@ -611,7 +611,7 @@
* sizeof(*pSpectCh));
if (pSpectCh == NULL) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"In %s, CDF_MALLOC_ERR", __func__);
return eSAP_FALSE;
}
@@ -642,7 +642,7 @@
/* check if the channel is in NOL blacklist */
if (sap_dfs_is_channel_in_nol_list(pSapCtx, *pChans,
PHY_SINGLE_CHANNEL_CENTERED)) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Ch %d is in NOL list", __func__,
*pChans);
chSafe = false;
@@ -652,8 +652,8 @@
if (include_dfs_ch == false) {
if (CDS_IS_DFS_CH(*pChans)) {
chSafe = false;
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, DFS Ch %d not considered for ACS",
__func__, *pChans);
continue;
@@ -664,8 +664,8 @@
for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) {
if ((safe_channels[i].channelNumber == *pChans) &&
(false == safe_channels[i].isSafe)) {
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Ch %d is not safe", __func__,
*pChans);
chSafe = false;
@@ -735,7 +735,7 @@
rssicountWeight = rssiWeight + countWeight;
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, rssiWeight=%d, countWeight=%d, rssicountWeight=%d",
__func__, rssiWeight, countWeight, rssicountWeight);
@@ -837,7 +837,7 @@
uint16_t *centerFreq_2)
{
if (NULL == pBeaconStruct) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("pBeaconStruct is NULL"));
return;
}
@@ -924,7 +924,7 @@
uint16_t num_ch;
int32_t offset = 0;
if (NULL == spect_ch) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("spect_ch is NULL"));
return;
}
@@ -1006,7 +1006,7 @@
void sap_interference_rssi_count(tSapSpectChInfo *spect_ch)
{
if (NULL == spect_ch) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"%s: spect_ch is NULL", __func__);
return;
}
@@ -1170,11 +1170,11 @@
pBeaconStruct = cdf_mem_malloc(sizeof(tSirProbeRespBeacon));
if (NULL == pBeaconStruct) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"Unable to allocate memory in sap_compute_spect_weight\n");
return;
}
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Computing spectral weight", __func__);
/**
@@ -1262,8 +1262,8 @@
break;
}
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, bssdes.ch_self=%d, bssdes.ch_ID=%d, bssdes.rssi=%d, SpectCh.bssCount=%d, pScanResult=%p, ChannelWidth %d, secondaryChanOffset %d, center frequency %d \n",
__func__,
pScanResult->BssDescriptor.
@@ -1286,7 +1286,7 @@
/* Calculate the weights for all channels in the spectrum pSpectCh */
pSpectCh = pSpectInfoParams->pSpectCh;
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Spectrum Channels Weight", __func__);
for (chn_num = 0; chn_num < (pSpectInfoParams->numSpectChans);
@@ -1308,7 +1308,7 @@
pSpectCh->weight_copy = pSpectCh->weight;
/* ------ Debug Info ------ */
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Chan=%d Weight= %d rssiAgr=%d bssCount=%d",
__func__, pSpectCh->chNum, pSpectCh->weight,
pSpectCh->rssiAgr, pSpectCh->bssCount);
@@ -1480,7 +1480,7 @@
pSpectInfo = pSpectInfoParams->pSpectCh;
for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("Channel=%d Weight= %d rssi=%d bssCount=%d"),
pSpectInfo->chNum, pSpectInfo->weight,
pSpectInfo->rssiAgr, pSpectInfo->bssCount);
@@ -1617,7 +1617,7 @@
pSpectInfo = pSpectInfoParams->pSpectCh;
for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("Channel=%d Weight= %d rssi=%d bssCount=%d"),
pSpectInfo->chNum, pSpectInfo->weight,
pSpectInfo->rssiAgr, pSpectInfo->bssCount);
@@ -1794,7 +1794,7 @@
pSpectInfo = pSpectInfoParams->pSpectCh;
for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Channel=%d Weight= %d rssi=%d bssCount=%d",
__func__, pSpectInfo->chNum, pSpectInfo->weight,
pSpectInfo->rssiAgr, pSpectInfo->bssCount);
@@ -1885,11 +1885,11 @@
#endif
/* For testing */
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Sorted Spectrum Channels Weight", __func__);
pSpectCh = pSpectInfoParams->pSpectCh;
for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Channel=%d Weight= %d rssi=%d bssCount=%d",
__func__, pSpectCh->chNum, pSpectCh->weight,
pSpectCh->rssiAgr, pSpectCh->bssCount);
@@ -1969,7 +1969,7 @@
uint32_t tmpChNum;
uint8_t count;
#endif
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Running SAP Ch Select", __func__);
#ifdef FEATURE_WLAN_CH_AVOID
@@ -1977,7 +1977,7 @@
#endif
if (NULL == pScanResult) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"%s: No external AP present\n", __func__);
#ifndef SOFTAP_CHANNEL_RANGE
@@ -1987,7 +1987,7 @@
endChannelNum = pSapCtx->acs_cfg->end_ch;
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"%s: start - end: %d - %d\n", __func__,
startChannelNum, endChannelNum);
@@ -2025,8 +2025,8 @@
continue;
if (safe_channels[i].isSafe == true) {
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_INFO_HIGH,
"%s: channel %d in the configuration is safe\n",
__func__,
safe_channels[i].
@@ -2036,8 +2036,8 @@
break;
}
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_INFO_HIGH,
"%s: channel %d in the configuration is unsafe\n",
__func__,
safe_channels[i].channelNumber);
@@ -2052,7 +2052,7 @@
/* Initialize the structure pointed by pSpectInfoParams */
if (sap_chan_sel_init(halHandle, pSpectInfoParams, pSapCtx) != eSAP_TRUE) {
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
"In %s, Ch Select initialization failed", __func__);
return SAP_CHANNEL_NOT_SELECTED;
}
@@ -2171,8 +2171,8 @@
continue;
#endif
bestChNum = pSpectInfoParams->pSpectCh[count].chNum;
- CDF_TRACE(QDF_MODULE_ID_SAP,
- CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP,
+ QDF_TRACE_LEVEL_INFO_HIGH,
"change best channel to %d in PCL",
bestChNum);
break;
@@ -2218,7 +2218,7 @@
/* Free all the allocated memory */
sap_chan_sel_exit(pSpectInfoParams);
- CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"In %s, Running SAP Ch select Completed, Ch=%d", __func__,
bestChNum);
if (bestChNum > 0 && bestChNum <= 252)