michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Renaming K_waitmend to _k_sem_group_wait_end

Browse source 
Updating micro kernel functions to follow a consistent naming convention.
Part of that process is the removal of camelCase naming conventions for the
preferred_underscore_method.

Change accomplished with the following script:

#!/bin/bash
echo "Searching for ${1} to replace with ${2}"

echo "Checking C, CPP, H, HPP, and s files..."
find . -type f \( -iname \*.[ch] -o -iname \*.[ch]pp -o -iname \*.s \) \
       -not \( -path host/src/genIdt -prune \) \
       -not \( -path host/src/gen_tables -prune \) \
       -print | xargs sed -i "s/"${1}"/"${2}"/g"

echo "Checking KCONF, LST, and PY files..."
find . -type f \( -iname \*.lst -o -iname \*.kconf -o -iname \*.py \) \
       -not \( -path host/src/genIdt -prune \) \
       -not \( -path host/src/gen_tables -prune \) \
       -print | xargs sed -i "s/"${1}"/"${2}"/g"

Change-Id: Id1c504bb09875fba3e75c80810eef3e0b037d125
Signed-off-by: Dan Kalowsky <daniel.kalowsky@intel.com>
This commit is contained in:
Dan Kalowsky 2015-04-28 11:35:50 -07:00 • committed by Anas Nashif
commit 34b2c67080
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/microkernel/entries.h
View file

@ -57,7 +57,7 @@ extern void K_waitmreq(struct k_args *);
extern void K_waitmrdy(struct k_args *); extern void K_waitmrdy(struct k_args *);
extern void K_waitmcan(struct k_args *); extern void K_waitmcan(struct k_args *);
extern void K_waitmacc(struct k_args *); extern void K_waitmacc(struct k_args *);
extern void K_waitmend(struct k_args *); extern void _k_sem_group_wait(struct k_args *);
extern void K_waitmtmo(struct k_args *); extern void K_waitmtmo(struct k_args *);
extern void K_inqsema(struct k_args *); extern void K_inqsema(struct k_args *);
extern void _k_mutex_lock_request(struct k_args *); extern void _k_mutex_lock_request(struct k_args *);

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

@ -43,7 +43,7 @@ extern void K_inqsema(struct k_args *A);
extern void K_waitmany(struct k_args *A); extern void K_waitmany(struct k_args *A);
extern void K_waitmtmo(struct k_args *A); extern void K_waitmtmo(struct k_args *A);
extern void K_waitmrdy(struct k_args *R); extern void K_waitmrdy(struct k_args *R);
extern void K_waitmend(struct k_args *R); extern void _k_sem_group_wait(struct k_args *R);
extern void K_waitmreq(struct k_args *A); extern void K_waitmreq(struct k_args *A);
extern void K_waitmcan(struct k_args *A); extern void K_waitmcan(struct k_args *A);
extern void K_waitmacc(struct k_args *A); extern void K_waitmacc(struct k_args *A);

10
kernel/microkernel/k_sema.c
View file

@ -102,12 +102,12 @@ static void signal_semaphore(int n, struct sem_struct *S)
/******************************************************************************* /*******************************************************************************
* *
* K_waitmend - finish handling incomplete waits on semaphores * _k_sem_group_wait - finish handling incomplete waits on semaphores
* *
* RETURNS: N/A * RETURNS: N/A
*/ */
void K_waitmend(struct k_args *R) void _k_sem_group_wait(struct k_args *R)
{ {
struct k_args *A = R->Ctxt.args; struct k_args *A = R->Ctxt.args;
@ -164,7 +164,7 @@ void K_waitmcan(struct k_args *A)
signal_semaphore(1, S); signal_semaphore(1, S);
} }
K_waitmend(X); _k_sem_group_wait(X);
} else } else
FREEARGS(X); /* ERROR */ FREEARGS(X); /* ERROR */
FREEARGS(A); FREEARGS(A);
@ -206,7 +206,7 @@ void K_waitmacc(struct k_args *A)
else else
S->Waiters = X->Forw; S->Waiters = X->Forw;
if (X->Comm == WAITMRDY) { if (X->Comm == WAITMRDY) {
K_waitmend(X); _k_sem_group_wait(X);
} else } else
FREEARGS(X); /* ERROR */ FREEARGS(X); /* ERROR */
FREEARGS(A); FREEARGS(A);
@ -314,7 +314,7 @@ void K_waitmreq(struct k_args *A)
else else
S->Waiters = X->Forw; S->Waiters = X->Forw;
if (X->Comm == WAITMCAN) { if (X->Comm == WAITMCAN) {
K_waitmend(X); _k_sem_group_wait(X);
} else } else
FREEARGS(X); /* ERROR */ FREEARGS(X); /* ERROR */
FREEARGS(A); FREEARGS(A);

2
scripts/sysgen.py
View file

@ -772,7 +772,7 @@ def kernel_main_c_kernel_services():
"/* 15 */ K_waitmrdy,", # depends on semaphores "/* 15 */ K_waitmrdy,", # depends on semaphores
"/* 16 */ K_waitmcan,", # depends on semaphores "/* 16 */ K_waitmcan,", # depends on semaphores
"/* 17 */ K_waitmacc,", # depends on semaphores "/* 17 */ K_waitmacc,", # depends on semaphores
"/* 18 */ K_waitmend,", # depends on semaphores "/* 18 */ _k_sem_group_wait,", # depends on semaphores
"/* 19 */ K_waitmtmo,", # depends on semaphores and timers "/* 19 */ K_waitmtmo,", # depends on semaphores and timers
"/* 20 */ K_inqsema,", # depends on semaphores "/* 20 */ K_inqsema,", # depends on semaphores
"/* 21 */ _k_mutex_lock_request,", # depends on mutexes "/* 21 */ _k_mutex_lock_request,", # depends on mutexes