michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Renaming K_waitmtmo to _k_sem_group_wait_timeout

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: Ie71e119d39a15d223a1c4f9d94f729f84dae1ed9
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 c822a446a7
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/microkernel/entries.h
View file

@ -58,7 +58,7 @@ extern void K_waitmrdy(struct k_args *);
extern void _k_sem_group_wait_cancel(struct k_args *); extern void _k_sem_group_wait_cancel(struct k_args *);
extern void _k_sem_group_wait_accept(struct k_args *); extern void _k_sem_group_wait_accept(struct k_args *);
extern void _k_sem_group_wait(struct k_args *); extern void _k_sem_group_wait(struct k_args *);
extern void K_waitmtmo(struct k_args *); extern void _k_sem_group_wait_timeout(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 *);
extern void _k_mutex_lock_reply(struct k_args *); extern void _k_mutex_lock_reply(struct k_args *);

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

@ -41,7 +41,7 @@ extern void K_waitsrpl(struct k_args *A);
extern void K_waitsreq(struct k_args *A); extern void K_waitsreq(struct k_args *A);
extern void K_inqsema(struct k_args *A); 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_sem_group_wait_timeout(struct k_args *A);
extern void K_waitmrdy(struct k_args *R); extern void K_waitmrdy(struct k_args *R);
extern void _k_sem_group_wait(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);

6
kernel/microkernel/k_sema.c
View file

@ -221,12 +221,12 @@ void _k_sem_group_wait_accept(struct k_args *A)
/******************************************************************************* /*******************************************************************************
* *
* K_waitmtmo - handle semaphore group timeout request * _k_sem_group_wait_timeout - handle semaphore group timeout request
* *
* RETURNS: N/A * RETURNS: N/A
*/ */
void K_waitmtmo(struct k_args *A) void _k_sem_group_wait_timeout(struct k_args *A)
{ {
ksem_t *L; ksem_t *L;
@ -268,7 +268,7 @@ void K_waitmrdy(struct k_args *R)
if (A->Time.timer) if (A->Time.timer)
force_timeout(A); force_timeout(A);
else else
K_waitmtmo(A); _k_sem_group_wait_timeout(A);
} }
FREEARGS(R); FREEARGS(R);
} }

2
scripts/sysgen.py
View file

@ -773,7 +773,7 @@ def kernel_main_c_kernel_services():
"/* 16 */ _k_sem_group_wait_cancel,", # depends on semaphores "/* 16 */ _k_sem_group_wait_cancel,", # depends on semaphores
"/* 17 */ _k_sem_group_wait_accept,", # depends on semaphores "/* 17 */ _k_sem_group_wait_accept,", # depends on semaphores
"/* 18 */ _k_sem_group_wait,", # depends on semaphores "/* 18 */ _k_sem_group_wait,", # depends on semaphores
"/* 19 */ K_waitmtmo,", # depends on semaphores and timers "/* 19 */ _k_sem_group_wait_timeout,", # 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
"/* 22 */ _k_mutex_lock_reply,", # depends on mutexes "/* 22 */ _k_mutex_lock_reply,", # depends on mutexes