michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename K_SemList to _k_sem_list

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

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

@ -49,7 +49,7 @@ extern struct map_struct _k_mem_map_list[];
#endif #endif
extern struct mbx_struct _k_mbox_list[]; extern struct mbx_struct _k_mbox_list[];
extern struct mutex_struct _k_mutex_list[]; extern struct mutex_struct _k_mutex_list[];
extern struct sem_struct K_SemList[]; extern struct sem_struct _k_sem_list[];
extern struct que_struct K_QueList[]; extern struct que_struct K_QueList[];
extern struct pool_struct K_PoolList[]; extern struct pool_struct K_PoolList[];
extern struct pipe_struct K_PipeList[]; extern struct pipe_struct K_PipeList[];

14
kernel/microkernel/k_sema.c
View file

@ -130,7 +130,7 @@ void K_waitmend(struct k_args *R)
void K_waitmcan(struct k_args *A) void K_waitmcan(struct k_args *A)
{ {
struct sem_struct *S = K_SemList + OBJ_INDEX(A->Args.s1.sema); struct sem_struct *S = _k_sem_list + OBJ_INDEX(A->Args.s1.sema);
struct k_args *X = S->Waiters; struct k_args *X = S->Waiters;
struct k_args *Y = NULL; struct k_args *Y = NULL;
@ -194,7 +194,7 @@ void K_waitmcan(struct k_args *A)
void K_waitmacc(struct k_args *A) void K_waitmacc(struct k_args *A)
{ {
struct sem_struct *S = K_SemList + OBJ_INDEX(A->Args.s1.sema); struct sem_struct *S = _k_sem_list + OBJ_INDEX(A->Args.s1.sema);
struct k_args *X = S->Waiters; struct k_args *X = S->Waiters;
struct k_args *Y = NULL; struct k_args *Y = NULL;
@ -302,7 +302,7 @@ void K_waitsrpl(struct k_args *A)
void K_waitmreq(struct k_args *A) void K_waitmreq(struct k_args *A)
{ {
struct sem_struct *S = K_SemList + OBJ_INDEX(A->Args.s1.sema); struct sem_struct *S = _k_sem_list + OBJ_INDEX(A->Args.s1.sema);
struct k_args *X = S->Waiters; struct k_args *X = S->Waiters;
struct k_args *Y = NULL; struct k_args *Y = NULL;
@ -391,7 +391,7 @@ void K_waitsreq(struct k_args *A)
uint32_t Sid; uint32_t Sid;
Sid = A->Args.s1.sema; Sid = A->Args.s1.sema;
S = K_SemList + OBJ_INDEX(Sid); S = _k_sem_list + OBJ_INDEX(Sid);
if (S->Level) { if (S->Level) {
S->Level--; S->Level--;
@ -475,7 +475,7 @@ void K_signals(struct k_args *A)
{ {
uint32_t Sid = A->Args.s1.sema; uint32_t Sid = A->Args.s1.sema;
signal_semaphore(1, K_SemList + OBJ_INDEX(Sid)); signal_semaphore(1, _k_sem_list + OBJ_INDEX(Sid));
} }
/******************************************************************************* /*******************************************************************************
@ -595,7 +595,7 @@ void K_resets(struct k_args *A)
{ {
uint32_t Sid = A->Args.s1.sema; uint32_t Sid = A->Args.s1.sema;
K_SemList[OBJ_INDEX(Sid)].Level = 0; _k_sem_list[OBJ_INDEX(Sid)].Level = 0;
} }
/******************************************************************************* /*******************************************************************************
@ -666,7 +666,7 @@ void K_inqsema(struct k_args *A)
uint32_t Sid; uint32_t Sid;
Sid = A->Args.s1.sema; Sid = A->Args.s1.sema;
S = K_SemList + OBJ_INDEX(Sid); S = _k_sem_list + OBJ_INDEX(Sid);
A->Time.rcode = S->Level; A->Time.rcode = S->Level;
} }

4
scripts/sysgen.py
View file

@ -519,13 +519,13 @@ def kernel_main_c_semas():
total_semas = len(sema_list) total_semas = len(sema_list)
if (total_semas == 0): if (total_semas == 0):
kernel_main_c_out("\nstruct sem_struct * K_SemList = NULL;\n") kernel_main_c_out("\nstruct sem_struct * _k_sem_list = NULL;\n")
return return
# semaphore descriptors # semaphore descriptors
kernel_main_c_out("\n" + kernel_main_c_out("\n" +
"struct sem_struct K_SemList[%s] =\n" % (total_semas) + "struct sem_struct _k_sem_list[%s] =\n" % (total_semas) +
"{\n") "{\n")
for semaphore in sema_list: for semaphore in sema_list:
kernel_main_c_out(" {NULL, 0, 0},\n") kernel_main_c_out(" {NULL, 0, 0},\n")