diff --git a/Kbuild b/Kbuild index 02a1718ce3c7..4bc9661cf047 100644 --- a/Kbuild +++ b/Kbuild @@ -596,7 +596,6 @@ endif MAC_SCH_OBJS := $(MAC_SRC_DIR)/pe/sch/sch_api.o \ $(MAC_SRC_DIR)/pe/sch/sch_beacon_gen.o \ $(MAC_SRC_DIR)/pe/sch/sch_beacon_process.o \ - $(MAC_SRC_DIR)/pe/sch/sch_debug.o \ $(MAC_SRC_DIR)/pe/sch/sch_message.o MAC_RRM_OBJS := $(MAC_SRC_DIR)/pe/rrm/rrm_api.o diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index aa943d3858fd..5a44d699619c 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -50,7 +50,6 @@ #include "lim_api.h" #include "sch_api.h" -#include "sch_debug.h" #include "sch_sys_params.h" #include "lim_trace.h" diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index b01b4afdb1fb..77995082947f 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -51,7 +51,6 @@ #include "parser_api.h" -#include "sch_debug.h" const uint8_t p2p_oui[] = { 0x50, 0x6F, 0x9A, 0x9 }; @@ -379,7 +378,7 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) } if (lim_is_session_he_capable(session)) { - sch_log(mac_ctx, LOGW, FL("Populate HE IEs")); + pe_warn("Populate HE IEs"); populate_dot11f_he_caps(mac_ctx, session, &bcn_2->vendor_he_cap); populate_dot11f_he_operation(mac_ctx, session, diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index c4f9863051d7..a9fa025ac480 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -43,7 +43,6 @@ #include "cfg_api.h" #include "lim_api.h" #include "utils_api.h" -#include "sch_debug.h" #include "sch_api.h" #include "lim_utils.h" diff --git a/core/mac/src/pe/sch/sch_debug.c b/core/mac/src/pe/sch/sch_debug.c deleted file mode 100644 index 28b65f45085d..000000000000 --- a/core/mac/src/pe/sch/sch_debug.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2011-2016 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 sch_debug.cc contains some debug functions. - * - * Author: Sandesh Goel - * Date: 02/25/02 - * History:- - * Date Modified by Modification Information - * -------------------------------------------------------------------- - * - */ - -#include "qdf_trace.h" -#include "sch_debug.h" -#define LOG_SIZE 256 - -void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) -{ - - QDF_TRACE_LEVEL qdf_debug_level; - char logBuffer[LOG_SIZE]; - va_list marker; - - /* getting proper Debug level */ - qdf_debug_level = get_vos_debug_level(loglevel); - - /* extracting arguments from pstring */ - va_start(marker, pString); - vsnprintf(logBuffer, LOG_SIZE, pString, marker); - QDF_TRACE(QDF_MODULE_ID_PE, qdf_debug_level, "%s", logBuffer); - va_end(marker); -} - -/* -------------------------------------------------------------------- */ diff --git a/core/mac/src/pe/sch/sch_debug.h b/core/mac/src/pe/sch/sch_debug.h deleted file mode 100644 index d27f72733dfe..000000000000 --- a/core/mac/src/pe/sch/sch_debug.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2011-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 sch_debug.h contains some debug macros. - * - * Author: Sandesh Goel - * Date: 02/25/02 - * History:- - * Date Modified by Modification Information - * -------------------------------------------------------------------- - * - */ - -#ifndef __SCH_DEBUG_H__ -#define __SCH_DEBUG_H__ - -#include "utils_api.h" -#include "sir_debug.h" - -#if !defined(__printf) -#define __printf(a, b) -#endif - -void __printf(3, 4) sch_log(tpAniSirGlobal pMac, uint32_t loglevel, - const char *pString, ...); - -#endif diff --git a/core/mac/src/pe/sch/sch_message.c b/core/mac/src/pe/sch/sch_message.c index c5570e581df0..eec70edf5d4e 100644 --- a/core/mac/src/pe/sch/sch_message.c +++ b/core/mac/src/pe/sch/sch_message.c @@ -35,7 +35,6 @@ #include "lim_send_messages.h" #include "sch_api.h" -#include "sch_debug.h" /* / Minimum beacon interval allowed (in Kus) */ #define SCH_BEACON_INTERVAL_MIN 10