From a3dddedab6a1fd68b70d2b78903b48638d31ae9c Mon Sep 17 00:00:00 2001 From: Flavio Ceolin Date: Wed, 24 Oct 2018 12:47:18 -0700 Subject: [PATCH] kernel: Use distinct macro names There is a struct and a macro called _ready_q, this is error prone. Just removing it. MISRA-C rule 5.4 Signed-off-by: Flavio Ceolin --- kernel/include/kernel_structs.h | 1 - kernel/include/ksched.h | 2 +- kernel/init.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/include/kernel_structs.h b/kernel/include/kernel_structs.h index d3c3051a0c0..e1615c53799 100644 --- a/kernel/include/kernel_structs.h +++ b/kernel/include/kernel_structs.h @@ -181,7 +181,6 @@ extern struct _kernel _kernel; #define _current _kernel.current #endif -#define _ready_q _kernel.ready_q #define _timeout_q _kernel.timeout_q #include diff --git a/kernel/include/ksched.h b/kernel/include/ksched.h index b7f556a74c6..f44e88da270 100644 --- a/kernel/include/ksched.h +++ b/kernel/include/ksched.h @@ -57,7 +57,7 @@ extern struct k_thread *_get_next_ready_thread(void); #else static ALWAYS_INLINE struct k_thread *_get_next_ready_thread(void) { - return _ready_q.cache; + return _kernel.ready_q.cache; } #endif diff --git a/kernel/init.c b/kernel/init.c index 788f0ae2ea2..444ea7b6a1b 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -319,7 +319,7 @@ static void prepare_multithreading(struct k_thread *dummy_thread) * contain garbage, which would prevent the cache loading algorithm * to work as intended */ - _ready_q.cache = _main_thread; + _kernel.ready_q.cache = _main_thread; #endif _setup_new_thread(_main_thread, _main_stack,