michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Renaming K_waitmacc to _k_sem_group_wait_accept

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: Idfa1822876c05b4416e7e254bec7c27195ed9737
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 b330543d90
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/microkernel/entries.h
View file

@ -56,7 +56,7 @@ extern void K_waitmany(struct k_args *);
extern void K_waitmreq(struct k_args *);
extern void K_waitmrdy(struct k_args *);
extern void _k_sem_group_wait_cancel(struct k_args *);
extern void K_waitmacc(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_waitmtmo(struct k_args *);
extern void K_inqsema(struct k_args *);

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

@ -46,6 +46,6 @@ extern void K_waitmrdy(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_sem_group_wait_cancel(struct k_args *A);
extern void K_waitmacc(struct k_args *A);
extern void _k_sem_group_wait_accept(struct k_args *A);
#endif

4
kernel/microkernel/k_sema.c
View file

@ -183,7 +183,7 @@ void _k_sem_group_wait_cancel(struct k_args *A)
/*******************************************************************************
*
* K_waitmacc - handle acceptance of the ready semaphore request
* _k_sem_group_wait_accept - handle acceptance of the ready semaphore request
*
* This routine only applies to semaphore group wait requests. It handles
* the request for the one semaphore in the group that "wins" the semaphore
@ -192,7 +192,7 @@ void _k_sem_group_wait_cancel(struct k_args *A)
* RETURNS: N/A
*/
void K_waitmacc(struct k_args *A)
void _k_sem_group_wait_accept(struct k_args *A)
{
struct sem_struct *S = _k_sem_list + OBJ_INDEX(A->Args.s1.sema);
struct k_args *X = S->Waiters;

2
scripts/sysgen.py
View file

@ -771,7 +771,7 @@ def kernel_main_c_kernel_services():
"/* 14 */ K_waitmreq,", # depends on semaphores
"/* 15 */ K_waitmrdy,", # depends on semaphores
"/* 16 */ _k_sem_group_wait_cancel,", # depends on semaphores
"/* 17 */ K_waitmacc,", # depends on semaphores
"/* 17 */ _k_sem_group_wait_accept,", # depends on semaphores
"/* 18 */ _k_sem_group_wait,", # depends on semaphores
"/* 19 */ K_waitmtmo,", # depends on semaphores and timers
"/* 20 */ K_inqsema,", # depends on semaphores