michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename K_TimerFree to _k_timer_free

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

2
include/microkernel/ticks.h
View file

@ -48,7 +48,7 @@ extern "C" {
extern int K_ticker(int event); 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_TimerFree; extern struct nano_lifo _k_timer_free;
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_this_node; extern const knode_t _k_this_node;

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

@ -75,7 +75,7 @@ extern struct nano_lifo LinkOut[6];
extern struct nano_lifo K_DataFree; extern struct nano_lifo K_DataFree;
extern struct nano_lifo _k_server_command_packet_free; extern struct nano_lifo _k_server_command_packet_free;
#ifndef LITE #ifndef LITE
extern struct nano_lifo K_TimerFree; extern struct nano_lifo _k_timer_free;
#endif #endif
extern void _Cput(struct nano_lifo *, void *); extern void _Cput(struct nano_lifo *, void *);
@ -237,14 +237,14 @@ extern void wlMonitorCalibrate(void);
#ifndef LITE #ifndef LITE
#define GETTIMER(T) \ #define GETTIMER(T) \
do { \ do { \
(T) = _Cget(&K_TimerFree); \ (T) = _Cget(&_k_timer_free); \
} while (0) } while (0)
#endif #endif
#define FREEARGS(A) _Cput(&_k_server_command_packet_free, (A)) #define FREEARGS(A) _Cput(&_k_server_command_packet_free, (A))
#define FREEDATA(D) _Cput(&K_DataFree, (D)) #define FREEDATA(D) _Cput(&K_DataFree, (D))
#ifndef LITE #ifndef LITE
#define FREETIMER(T) _Cput(&K_TimerFree, (T)) #define FREETIMER(T) _Cput(&_k_timer_free, (T))
#endif #endif
#define TO_ALIST(L, A) _Cpsh((L), (uint32_t)(A)) #define TO_ALIST(L, A) _Cpsh((L), (uint32_t)(A))

2
kernel/microkernel/k_timer.c
View file

@ -207,7 +207,7 @@ void K_alloc_timer(
K_TIMER *T; K_TIMER *T;
struct k_args *A; struct k_args *A;
T = _Cget(&K_TimerFree); T = _Cget(&_k_timer_free);
P->Args.c1.timer = T; P->Args.c1.timer = T;
if (T) { if (T) {

2
scripts/sysgen.py
View file

@ -355,7 +355,7 @@ def kernel_main_c_timers():
# linked list of free timers # linked list of free timers
kernel_main_c_out("\n" + kernel_main_c_out("\n" +
"struct nano_lifo K_TimerFree = " + "struct nano_lifo _k_timer_free = " +
"{(void *) &K_TimerBlocks[%d], NULL};\n" % (num_timers - 1)) "{(void *) &K_TimerBlocks[%d], NULL};\n" % (num_timers - 1))