From 7ca6ed4a8c03c51592e8521873ef1d4e0697ad0a Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Mon, 27 Apr 2015 10:28:30 -0500 Subject: [PATCH] Rename K_DebugHalt to _k_debug_halt 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: Ia591e26dc082302ea4333deeb132d1732700e63e Signed-off-by: Yonattan Louise --- kernel/microkernel/core/global.c | 2 +- kernel/microkernel/include/minik.h | 2 +- kernel/microkernel/k_task.c | 4 ++-- kernel/microkernel/task_monitor.c | 4 ++-- kernel/microkernel/timer/ticker.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/microkernel/core/global.c b/kernel/microkernel/core/global.c index 53149f6afcf..abd2a78d01d 100644 --- a/kernel/microkernel/core/global.c +++ b/kernel/microkernel/core/global.c @@ -55,7 +55,7 @@ struct nano_stack __noinit _k_command_stack; #ifdef CONFIG_TASK_DEBUG -int K_DebugHalt = 0; +int _k_debug_halt = 0; #endif #if CONFIG_COMMAND_STACK_SIZE <= 0 diff --git a/kernel/microkernel/include/minik.h b/kernel/microkernel/include/minik.h index ff59568b421..ba983f6535f 100644 --- a/kernel/microkernel/include/minik.h +++ b/kernel/microkernel/include/minik.h @@ -143,7 +143,7 @@ extern void init_drivers(void); #ifdef CONFIG_TASK_DEBUG -extern int K_DebugHalt; +extern int _k_debug_halt; extern char *K_NodeNames[]; extern char **K_TaskNames[]; #ifndef LITE diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index 6a30a9f5a95..b0231376e59 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -313,9 +313,9 @@ void K_groupop(struct k_args *A) #ifdef CONFIG_TASK_DEBUG if (opt == GROUP_TASK_BLOCK) - K_DebugHalt = 1; + _k_debug_halt = 1; if (opt == GROUP_TASK_UNBLOCK) - K_DebugHalt = 0; + _k_debug_halt = 0; #endif for (i = 0, X = _k_task_list; i < _k_task_count; i++, X++) { diff --git a/kernel/microkernel/task_monitor.c b/kernel/microkernel/task_monitor.c index 894c4a48c20..8c746ce7a21 100644 --- a/kernel/microkernel/task_monitor.c +++ b/kernel/microkernel/task_monitor.c @@ -61,7 +61,7 @@ void KS_TaskSetSwitchCallBack(taskswitchcallbackfunc func) void K_monitor_task(struct k_proc *X, uint32_t D) { #ifdef CONFIG_TASK_DEBUG - if (!K_DebugHalt) + if (!_k_debug_halt) #endif { K_monitor_wptr->time = timer_read(); @@ -82,7 +82,7 @@ void K_monitor_task(struct k_proc *X, uint32_t D) void K_monitor_args(struct k_args *A) { #ifdef CONFIG_TASK_DEBUG - if (!K_DebugHalt) + if (!_k_debug_halt) #endif { K_monitor_wptr->time = timer_read(); diff --git a/kernel/microkernel/timer/ticker.c b/kernel/microkernel/timer/ticker.c index 7dbc9c2c0f2..52fe2cd25d7 100644 --- a/kernel/microkernel/timer/ticker.c +++ b/kernel/microkernel/timer/ticker.c @@ -166,7 +166,7 @@ uint32_t __noinit K_DebugLowTime; static inline int _TlDebugUpdate(int32_t ticks) { K_DebugLowTime += ticks; - return !K_DebugHalt; + return !_k_debug_halt; } #else #define _TlDebugUpdate(ticks) 1