diff options
| author | Srinivas Girigowda <sgirigow@codeaurora.org> | 2017-03-16 00:01:21 -0700 |
|---|---|---|
| committer | Sandeep Puligilla <spuligil@codeaurora.org> | 2017-03-21 09:40:47 -0700 |
| commit | 164d4993f55984b830394aca4ec7b9ae91775d34 (patch) | |
| tree | d39ba0b07f64d78e9d50a0b818df7bdb19342ccb | |
| parent | 0b2b2576a23f7511c4dcfb1b8050eb3da6d4ee67 (diff) | |
qcacld-3.0: UMAC: Remove obsolete file lim_debug.[c|h]
Remove obsolete file lim_debug.[c|h].
Change-Id: I0eee336da7f5ac2931ffe38020057b40cfda4ec5
CRs-Fixed: 2020798
| -rw-r--r-- | Kbuild | 1 | ||||
| -rw-r--r-- | core/mac/src/dph/dph_hash_table.c | 5 | ||||
| -rw-r--r-- | core/mac/src/pe/include/lim_api.h | 2 | ||||
| -rw-r--r-- | core/mac/src/pe/include/lim_ft.h | 3 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_admit_control.c | 1 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_api.c | 12 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_debug.h | 61 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_tdls.c | 4 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_session.c | 1 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_session_utils.c | 3 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_types.h | 1 |
11 files changed, 19 insertions, 75 deletions
@@ -537,7 +537,6 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_admit_control.o \ $(MAC_SRC_DIR)/pe/lim/lim_api.o \ $(MAC_SRC_DIR)/pe/lim/lim_assoc_utils.o \ - $(MAC_SRC_DIR)/pe/lim/lim_debug.o \ $(MAC_SRC_DIR)/pe/lim/lim_ft.o \ $(MAC_SRC_DIR)/pe/lim/lim_ibss_peer_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_link_monitoring_algo.o \ diff --git a/core/mac/src/dph/dph_hash_table.c b/core/mac/src/dph/dph_hash_table.c index ae22dd7973fb..0c1a861f2299 100644 --- a/core/mac/src/dph/dph_hash_table.c +++ b/core/mac/src/dph/dph_hash_table.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -41,8 +41,7 @@ #include "cfg_api.h" #include "sch_api.h" #include "dph_global.h" -#include "lim_debug.h" - +#include "lim_api.h" #include "wma_if.h" /* --------------------------------------------------------------------- */ diff --git a/core/mac/src/pe/include/lim_api.h b/core/mac/src/pe/include/lim_api.h index d733a87c4e71..396334d63fc6 100644 --- a/core/mac/src/pe/include/lim_api.h +++ b/core/mac/src/pe/include/lim_api.h @@ -329,5 +329,7 @@ QDF_STATUS lim_update_ext_cap_ie(tpAniSirGlobal mac_ctx, uint8_t *ie_data, uint8_t *local_ie_buf, uint16_t *local_ie_len); QDF_STATUS lim_add_qcn_ie(tpAniSirGlobal mac_ctx, uint8_t *ie_data, uint16_t *ie_len); +void lim_log(tpAniSirGlobal pMac, uint32_t loglevel, + const char *pString, ...); /************************************************************/ #endif /* __LIM_API_H */ diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index e4751139a6f2..645c53f44f39 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.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. * @@ -37,7 +37,6 @@ #include <cds_api.h> #include <lim_global.h> #include <ani_global.h> -#include <lim_debug.h> #include <lim_ser_des_utils.h> /*------------------------------------------------------------------------- diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c index 0a5b025eb505..031508713b3a 100644 --- a/core/mac/src/pe/lim/lim_admit_control.c +++ b/core/mac/src/pe/lim/lim_admit_control.c @@ -36,7 +36,6 @@ * -------------------------------------------------------------------- * */ -#include "lim_debug.h" #include "sys_def.h" #include "lim_api.h" #include "cfg_api.h" /* wlan_cfg_get_int() */ diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 9fedeeb8d98c..c518018123d2 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -2367,3 +2367,15 @@ QDF_STATUS lim_add_qcn_ie(tpAniSirGlobal mac_ctx, uint8_t *ie_data, (*ie_len) += (QCN_IE_VERSION_SUBATTR_LEN); return QDF_STATUS_SUCCESS; } + +void lim_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) +{ +#ifdef WLAN_DEBUG + va_list marker; + + va_start(marker, pString); + log_debug(pMac, SIR_LIM_MODULE_ID, loglevel, pString, marker); + va_end(marker); +#endif +} + diff --git a/core/mac/src/pe/lim/lim_debug.h b/core/mac/src/pe/lim/lim_debug.h deleted file mode 100644 index e0ab7f6251f1..000000000000 --- a/core/mac/src/pe/lim/lim_debug.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2011-2012, 2014-2015 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. - */ - -/* - * This file lim_debug.h contains log function called by LIM module. - * - * Author: Chandra Modumudi - * Date: 02/11/02 - * History:- - * Date Modified by Modification Information - * -------------------------------------------------------------------- - * - */ - -#ifndef __LIM_DEBUG_H__ -#define __LIM_DEBUG_H__ - -#include "utils_api.h" -#include "sir_debug.h" - -#if !defined(__printf) -#define __printf(a, b) -#endif - -void __printf(3, 4) lim_log(tpAniSirGlobal pMac, uint32_t loglevel, - const char *pString, ...); - -/* define this to show more message in the LIM during TDLS development */ -#define LIM_DEBUG_TDLS - -#ifdef LIM_DEBUG_TDLS -#define LIM_LOG_TDLS(x0) x0 -#else -#define LIM_LOG_TDLS(x0) -#endif - -#endif diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index ed9bb0729441..84ee26bf9778 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -170,8 +170,6 @@ enum tdls_peer_capability { CLEAR_BIT(peer_bitmap[1], ((aid) - (sizeof(uint32_t) << 3)));\ } while (0); -#ifdef LIM_DEBUG_TDLS - #ifdef FEATURE_WLAN_TDLS #define WNI_CFG_TDLS_LINK_SETUP_RSP_TIMEOUT (800) #define WNI_CFG_TDLS_LINK_SETUP_CNF_TIMEOUT (200) @@ -201,7 +199,7 @@ static const uint8_t *lim_trace_tdls_action_string(uint8_t tdlsActionCode) } return (const uint8_t *)"UNKNOWN"; } -#endif + /* * initialize TDLS setup list and related data structures. */ diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 106be6d18c78..b6153c06abbf 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -39,7 +39,6 @@ Include Files ------------------------------------------------------------------------*/ #include "ani_global.h" -#include "lim_debug.h" #include "lim_ft_defs.h" #include "lim_ft.h" #include "lim_session.h" diff --git a/core/mac/src/pe/lim/lim_session_utils.c b/core/mac/src/pe/lim/lim_session_utils.c index fb9aab1443e2..6571da74e7f9 100644 --- a/core/mac/src/pe/lim/lim_session_utils.c +++ b/core/mac/src/pe/lim/lim_session_utils.c @@ -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. * @@ -36,7 +36,6 @@ Include Files ------------------------------------------------------------------------*/ #include "ani_global.h" -#include "lim_debug.h" #include "lim_ft_defs.h" #include "lim_session.h" #include "lim_session_utils.h" diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index b45046763620..cfbe70823874 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -45,7 +45,6 @@ #include "utils_api.h" #include "lim_api.h" -#include "lim_debug.h" #include "lim_trace.h" #include "lim_send_sme_rsp_messages.h" #include "sys_global.h" |
