michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename K_TimerBlocks to _k_timer_blocks

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" -o -name "*.arch" \) \
            ! -path "./host/src/genIdt/*" \
            ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g';

Change-Id: Ia753f8415b656e3b819a9cdb1eb24d02b750f9d2
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-05-08 17:13:00 -05:00 • committed by Anas Nashif
commit 068a98add2
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/microkernel/ticks.h
View file

@ -49,7 +49,7 @@ extern int K_ticker(int event);
extern K_TIMER *_k_timer_list_head; extern K_TIMER *_k_timer_list_head;
extern K_TIMER *_k_timer_list_tail; extern K_TIMER *_k_timer_list_tail;
extern struct nano_lifo _k_timer_free; extern struct nano_lifo _k_timer_free;
extern K_TIMER K_TimerBlocks[]; /* array of microkernel timer objects */ extern K_TIMER _k_timer_blocks[]; /* array of microkernel timer objects */
extern void scheduler_time_slice_set(int32_t t, kpriority_t p); extern void scheduler_time_slice_set(int32_t t, kpriority_t p);
@ -71,7 +71,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)(0x00010000u + (uint32_t)(timer - &K_TimerBlocks[0])); return (ktimer_t)(0x00010000u + (uint32_t)(timer - &_k_timer_blocks[0]));
} }
/******************************************************************************* /*******************************************************************************
@ -85,7 +85,7 @@ static inline ktimer_t _timer_ptr_to_id(K_TIMER *timer)
static inline K_TIMER *_timer_id_to_ptr(ktimer_t timer) static inline K_TIMER *_timer_id_to_ptr(ktimer_t timer)
{ {
return &K_TimerBlocks[OBJ_INDEX(timer)]; return &_k_timer_blocks[OBJ_INDEX(timer)];
} }
extern uint32_t task_cycle_get_32(void); extern uint32_t task_cycle_get_32(void);

8
scripts/sysgen.py
View file

@ -343,15 +343,15 @@ def kernel_main_c_timers():
# timer descriptors # timer descriptors
kernel_main_c_out("\n" + kernel_main_c_out("\n" +
"K_TIMER K_TimerBlocks[%d] =\n" % (num_timers) + "K_TIMER _k_timer_blocks[%d] =\n" % (num_timers) +
"{\n" + "{\n" +
" {NULL, NULL, 0, 0, (struct k_args *)0xffffffff},\n") " {NULL, NULL, 0, 0, (struct k_args *)0xffffffff},\n")
for i in range(1, num_timers - 1): for i in range(1, num_timers - 1):
kernel_main_c_out( kernel_main_c_out(
" {&K_TimerBlocks[%d], NULL, 0, 0, " % (i - 1) + " {&_k_timer_blocks[%d], NULL, 0, 0, " % (i - 1) +
"(struct k_args *)0xffffffff},\n") "(struct k_args *)0xffffffff},\n")
kernel_main_c_out( kernel_main_c_out(
" {&K_TimerBlocks[%d], NULL, 0, 0, (struct k_args *)0xffffffff}\n" % " {&_k_timer_blocks[%d], NULL, 0, 0, (struct k_args *)0xffffffff}\n" %
(num_timers - 2) + (num_timers - 2) +
"};\n") "};\n")
@ -360,7 +360,7 @@ def kernel_main_c_timers():
kernel_main_c_out("\n" + kernel_main_c_out("\n" +
"struct nano_lifo _k_timer_free = " + "struct nano_lifo _k_timer_free = " +
"{{NULL, &_k_timer_free.wait_q.head}, " + "{{NULL, &_k_timer_free.wait_q.head}, " +
"(void *) &K_TimerBlocks[%d]};\n" % (num_timers - 1)) "(void *) &_k_timer_blocks[%d]};\n" % (num_timers - 1))
def kernel_main_c_tasks(): def kernel_main_c_tasks():