From 07dd3b218836b80f594b67934917cb461ecc9fb9 Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Mon, 27 Apr 2015 10:28:27 -0500 Subject: [PATCH] Rename K_PrioBitMap to _k_task_priority_bitmap Updating global variable's name to follow a consistent naming convention. Change accomplished with the following script: #!/bin/bash echo "Searching for ${1} to replace with ${2}" find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" \) \ ! -path "./host/src/genIdt/*" \ ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g'; Change-Id: Iff92324e4442883cde8d7e1b6831d091c77584ce Signed-off-by: Yonattan Louise --- kernel/microkernel/core/global.c | 2 +- kernel/microkernel/include/minik.h | 2 +- kernel/microkernel/k_task.c | 4 ++-- kernel/nanokernel/core/microk.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/microkernel/core/global.c b/kernel/microkernel/core/global.c index 517ad7a2e0d..9454865d155 100644 --- a/kernel/microkernel/core/global.c +++ b/kernel/microkernel/core/global.c @@ -49,7 +49,7 @@ extern char _k_server_stack[]; /* generated by SYSGEN */ * Initialize the priority bit map globals to indicate that * only the idle task is ready to run */ -uint32_t K_PrioBitMap[2] = {0, (1u << 31)}; +uint32_t _k_task_priority_bitmap[2] = {0, (1u << 31)}; struct nano_stack __noinit K_Args; diff --git a/kernel/microkernel/include/minik.h b/kernel/microkernel/include/minik.h index 3233c90abb9..ce3f5c50888 100644 --- a/kernel/microkernel/include/minik.h +++ b/kernel/microkernel/include/minik.h @@ -61,7 +61,7 @@ extern int _k_mem_pool_count; extern int _k_pipe_count; extern struct k_proc *_k_current_task; -extern uint32_t K_PrioBitMap[]; +extern uint32_t _k_task_priority_bitmap[]; #ifndef LITE extern K_TIMER *K_Thead; diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index c7c08c5b193..6a30a9f5a95 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -81,7 +81,7 @@ void reset_state_bit(struct k_proc *X, /* ptr to task */ X->Forw = NULL; H->Tail->Forw = X; H->Tail = X; - K_PrioBitMap[X->Prio >> 5] |= (1 << (X->Prio & 0x1F)); + _k_task_priority_bitmap[X->Prio >> 5] |= (1 << (X->Prio & 0x1F)); } #ifdef CONFIG_TASK_MONITOR @@ -166,7 +166,7 @@ void set_state_bit( * runnable, then clear that bit in the global priority bit map. */ if (task_queue->Head == NULL) { - K_PrioBitMap[task_ptr->Prio >> 5] &= ~(1 << (task_ptr->Prio & 0x1F)); + _k_task_priority_bitmap[task_ptr->Prio >> 5] &= ~(1 << (task_ptr->Prio & 0x1F)); } } diff --git a/kernel/nanokernel/core/microk.c b/kernel/nanokernel/core/microk.c index 1f1bf436f63..0f2774d27ae 100644 --- a/kernel/nanokernel/core/microk.c +++ b/kernel/nanokernel/core/microk.c @@ -120,10 +120,10 @@ FUNC_NORETURN void K_swapper(int parameter1, /* not used */ * Check the low bitmask is not 0. Some built in bit scanning * functions have the result undefined if the argument is 0. */ - if (K_PrioBitMap[0]) - K_PrioListIdx = find_first_set_inline(K_PrioBitMap[0]) - 1; + if (_k_task_priority_bitmap[0]) + K_PrioListIdx = find_first_set_inline(_k_task_priority_bitmap[0]) - 1; else - K_PrioListIdx = find_first_set_inline(K_PrioBitMap[1]) + 31; + K_PrioListIdx = find_first_set_inline(_k_task_priority_bitmap[1]) + 31; /* * There is no need to check whether K_PrioListIx is 0 since * it's guaranteed that there will always be at least one task