diff options
| -rw-r--r-- | core/mac/inc/ani_global.h | 1 | ||||
| -rw-r--r-- | core/mac/src/include/utils_api.h | 2 | ||||
| -rw-r--r-- | core/mac/src/include/utils_global.h | 50 | ||||
| -rw-r--r-- | core/mac/src/sys/legacy/src/utils/src/log_api.c | 1 |
4 files changed, 1 insertions, 53 deletions
diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 7688280952b0..6e28e95fc9d1 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -37,7 +37,6 @@ #include "sch_global.h" #include "sys_global.h" #include "cfg_global.h" -#include "utils_global.h" #include "sir_api.h" #include "csr_api.h" diff --git a/core/mac/src/include/utils_api.h b/core/mac/src/include/utils_api.h index b98e724352a6..795151cf39ba 100644 --- a/core/mac/src/include/utils_api.h +++ b/core/mac/src/include/utils_api.h @@ -31,7 +31,6 @@ #include <stdarg.h> #include <sir_common.h> #include "ani_global.h" -#include "utils_global.h" #include "sys_wrapper.h" /* / System role definition on a per BSS */ @@ -47,6 +46,7 @@ typedef enum eBssSystemRole { eSYSTEM_MULTI_BSS_ROLE = eSYSTEM_LAST_ROLE } tBssSystemRole; +#define LOG_FIRST_MODULE_ID SIR_FIRST_MODULE_ID #define LOG_INDEX_FOR_MODULE(modId) ((modId) - LOG_FIRST_MODULE_ID) #define GET_MIN_VALUE(__val1, __val2) ((__val1 < __val2) ? __val1 : __val2) diff --git a/core/mac/src/include/utils_global.h b/core/mac/src/include/utils_global.h deleted file mode 100644 index 14e6c6a9df24..000000000000 --- a/core/mac/src/include/utils_global.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2011-2012, 2014, 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. - */ - -/* - * - * Author: Sandesh Goel - * Date: 02/25/02 - * History:- - * Date Modified by Modification Information - * -------------------------------------------------------------------- - * - */ - -#ifndef __UTILS_GLOBAL_H__ -#define __UTILS_GLOBAL_H__ - -#include "sir_params.h" - -/* - * Current debug and event log level - */ -#define LOG_FIRST_MODULE_ID SIR_FIRST_MODULE_ID -#define LOG_LAST_MODULE_ID SIR_LAST_MODULE_ID -#define LOG_ENTRY_NUM (LOG_LAST_MODULE_ID - LOG_FIRST_MODULE_ID + 1) - -#endif 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 index 22e8eac23f3f..1a22257dfdcf 100644 --- a/core/mac/src/sys/legacy/src/utils/src/log_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/log_api.c @@ -42,7 +42,6 @@ #include <wma_types.h> #include <stdarg.h> -#include "utils_global.h" #include "mac_init_api.h" #include "qdf_trace.h" |
