From fab25264ac34ba66d0a7c387b58f0a743cf39292 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Sun, 26 Mar 2017 23:06:33 -0700 Subject: [PATCH] qcacld-3.0: Remove log_dbg/debug() & obsolete file log_api.c Remove log_dbg/debug() & obsolete file log_api.c. Change-Id: I66cc59cd9c95dc019d9cf6032d3a3da772464d22 CRs-Fixed: 1093093 --- Kbuild | 1 - core/mac/src/include/utils_api.h | 7 - .../src/sys/legacy/src/utils/src/log_api.c | 151 ------------------ 3 files changed, 159 deletions(-) delete mode 100644 core/mac/src/sys/legacy/src/utils/src/log_api.c diff --git a/Kbuild b/Kbuild index ab0c3b6528fa..1cd202872395 100644 --- a/Kbuild +++ b/Kbuild @@ -754,7 +754,6 @@ SYS_OBJS := $(SYS_COMMON_SRC_DIR)/wlan_qct_sys.o \ $(SYS_LEGACY_SRC_DIR)/system/src/mac_init_api.o \ $(SYS_LEGACY_SRC_DIR)/system/src/sys_entry_func.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/dot11f.o \ - $(SYS_LEGACY_SRC_DIR)/utils/src/log_api.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/mac_trace.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/parser_api.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/utils_parser.o diff --git a/core/mac/src/include/utils_api.h b/core/mac/src/include/utils_api.h index 41458606a75b..e1b434d78c10 100644 --- a/core/mac/src/include/utils_api.h +++ b/core/mac/src/include/utils_api.h @@ -50,13 +50,6 @@ typedef enum eBssSystemRole { #define LOG_INDEX_FOR_MODULE(modId) ((modId) - LOG_FIRST_MODULE_ID) #define GET_MIN_VALUE(__val1, __val2) ((__val1 < __val2) ? __val1 : __val2) -/* The caller must check loglevel. This API assumes loglevel is good */ -extern void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, - const char *pStr, va_list marker); - -extern void log_dbg(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, - const char *pStr, ...); - extern uint32_t gPktAllocCnt, gPktFreeCnt; extern QDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel); diff --git a/core/mac/src/sys/legacy/src/utils/src/log_api.c b/core/mac/src/sys/legacy/src/utils/src/log_api.c deleted file mode 100644 index 1a22257dfdcf..000000000000 --- a/core/mac/src/sys/legacy/src/utils/src/log_api.c +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * log_api.cc - Handles log messages for all the modules. - * Author: Kevin Nguyen - * Date: 02/27/02 - * History:- - * 02/11/02 Created. - * 03/12/02 Rearrange log_debug parameter list and add more params. - * -------------------------------------------------------------------- - * - */ - -#include -#include -#include -#include - -#include -#include "mac_init_api.h" - -#include "qdf_trace.h" - -#ifdef ANI_OS_TYPE_ANDROID -#include -#endif - -/** - * log_dbg() - * - ***FUNCTION: - * This function is called to log a debug message. - * - ***PARAMS: - * - ***LOGIC: - * - ***ASSUMPTIONS: - * None. - * - ***NOTE: - * - * @param tpAniSirGlobal Sirius software parameter strucutre pointer - * @param ModId 8-bit modID - * @param debugLevel debugging level for this message - * @param pStr string parameter pointer - * @return None - */ - -void log_dbg(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, - const char *pStr, ...) -{ -#ifdef WLAN_DEBUG - va_list marker; - - va_start(marker, pStr); - log_debug(pMac, modId, debugLevel, pStr, marker); - va_end(marker); -#endif -} - -QDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel) -{ - switch (debugLevel) { - case LOGP: - return QDF_TRACE_LEVEL_FATAL; - case LOGE: - return QDF_TRACE_LEVEL_ERROR; - case LOGW: - return QDF_TRACE_LEVEL_WARN; - case LOG1: - return QDF_TRACE_LEVEL_INFO; - case LOG2: - return QDF_TRACE_LEVEL_INFO_HIGH; - case LOG3: - return QDF_TRACE_LEVEL_INFO_MED; - case LOG4: - return QDF_TRACE_LEVEL_INFO_LOW; - case LOGD: - default: - return QDF_TRACE_LEVEL_DEBUG; - } -} - -static inline QDF_MODULE_ID get_vos_module_id(uint8_t modId) -{ - switch (modId) { - case SIR_HAL_MODULE_ID: - return QDF_MODULE_ID_WMA; - - case SIR_LIM_MODULE_ID: - case SIR_SCH_MODULE_ID: - case SIR_CFG_MODULE_ID: - case SIR_MNT_MODULE_ID: - case SIR_DPH_MODULE_ID: - case SIR_DBG_MODULE_ID: - return QDF_MODULE_ID_PE; - - case SIR_SYS_MODULE_ID: - return QDF_MODULE_ID_SYS; - - case SIR_SMS_MODULE_ID: - return QDF_MODULE_ID_SME; - - default: - return QDF_MODULE_ID_SYS; - } -} - -#define LOG_SIZE 256 -void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, - const char *pStr, va_list marker) -{ - QDF_TRACE_LEVEL qdf_debug_level; - QDF_MODULE_ID qdf_module_id; - char logBuffer[LOG_SIZE]; - - qdf_debug_level = get_vos_debug_level(debugLevel); - qdf_module_id = get_vos_module_id(modId); - - vsnprintf(logBuffer, LOG_SIZE - 1, pStr, marker); - QDF_TRACE(qdf_module_id, qdf_debug_level, "%s", logBuffer); - - /* The caller must check loglevel */ - QDF_ASSERT((LOGP != debugLevel)); -} /*** end log_debug() ***/