michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename K_ThisNode to _k_this_node

Browse source 
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: I1b3cb984fa75cd1a83649c81787a40aee97f8a32
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-04-27 10:28:22 -05:00 • committed by Anas Nashif
commit a07990ecea
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/microkernel.h
View file

@ -76,7 +76,7 @@ typedef void (*taskabortfunction)(void);
extern void kernel_init(void); extern void kernel_init(void);
extern void init_node(void); /* generated function */ extern void init_node(void); /* generated function */
extern void init_drivers(void); /* generated function */ extern void init_drivers(void); /* generated function */
extern const knode_t K_ThisNode; extern const knode_t _k_this_node;
extern int K_StackSize; extern int K_StackSize;
extern int K_TaskCount; extern int K_TaskCount;

4
include/microkernel/task.h
View file

@ -40,7 +40,7 @@ extern "C" {
#include <microkernel/task_api_export.h> #include <microkernel/task_api_export.h>
extern struct k_proc *K_Task; extern struct k_proc *K_Task;
extern const knode_t K_ThisNode; extern const knode_t _k_this_node;
/* /*
* The following task groups are reserved for system use. * The following task groups are reserved for system use.
@ -88,7 +88,7 @@ extern void KS_TaskSetSwitchCallBack(taskswitchcallbackfunc func);
#define task_group_mask_get() (K_Task->Group) #define task_group_mask_get() (K_Task->Group)
#define task_group_join(g) (K_Task->Group |= g) #define task_group_join(g) (K_Task->Group |= g)
#define task_group_leave(g) (K_Task->Group &= ~g) #define task_group_leave(g) (K_Task->Group &= ~g)
#define task_node_id_get() (K_ThisNode) #define task_node_id_get() (_k_this_node)
#define isr_task_id_get() task_id_get() #define isr_task_id_get() task_id_get()
#define isr_task_priority_get() task_priority_get() #define isr_task_priority_get() task_priority_get()

4
include/microkernel/ticks.h
View file

@ -50,7 +50,7 @@ extern K_TIMER *K_Thead;
extern K_TIMER *K_Ttail; extern K_TIMER *K_Ttail;
extern struct nano_lifo K_TimerFree; extern struct nano_lifo K_TimerFree;
extern K_TIMER K_TimerBlocks[]; /* array of microkernel timer objects */ extern K_TIMER K_TimerBlocks[]; /* array of microkernel timer objects */
extern const knode_t K_ThisNode; extern const knode_t _k_this_node;
extern void scheduler_time_slice_set(int32_t t, kpriority_t p); extern void scheduler_time_slice_set(int32_t t, kpriority_t p);
@ -70,7 +70,7 @@ extern void scheduler_time_slice_set(int32_t t, kpriority_t p);
static inline ktimer_t _timer_ptr_to_id(K_TIMER *timer) static inline ktimer_t _timer_ptr_to_id(K_TIMER *timer)
{ {
return (ktimer_t)((K_ThisNode << 16) + return (ktimer_t)((_k_this_node << 16) +
(uint32_t)(timer - &K_TimerBlocks[0])); (uint32_t)(timer - &K_TimerBlocks[0]));
} }

2
kernel/microkernel/include/minik.h
View file

@ -38,7 +38,7 @@
#define KERNEL_ENTRY(A) K_taskcall(A) #define KERNEL_ENTRY(A) K_taskcall(A)
extern const knode_t K_ThisNode; extern const knode_t _k_this_node;
extern struct k_proc _k_task_list[]; extern struct k_proc _k_task_list[];
extern struct k_tqhd _k_task_priority_list[]; extern struct k_tqhd _k_task_priority_list[];

2
scripts/sysgen.py
View file

@ -302,7 +302,7 @@ def kernel_main_c_header():
"#include <sections.h>\n" + "#include <sections.h>\n" +
"#include <vxmicro.h>\n") "#include <vxmicro.h>\n")
kernel_main_c_out("\nconst knode_t K_ThisNode = 0x00010000;\n") kernel_main_c_out("\nconst knode_t _k_this_node = 0x00010000;\n")
kernel_main_c_out("\n" + kernel_main_c_out("\n" +
"char __noinit _k_server_stack[CONFIG_MICROKERNEL_SERVER_STACK_SIZE];\n") "char __noinit _k_server_stack[CONFIG_MICROKERNEL_SERVER_STACK_SIZE];\n")
kernel_main_c_out( kernel_main_c_out(