michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Renaming K_lockrpl to _k_mutex_lock_reply

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: I8aefe976518badd3acbe2b246f695931d94c58ed
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 d3c35c2d40
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

@ -61,7 +61,7 @@ extern void K_waitmend(struct k_args *);
extern void K_waitmtmo(struct k_args *);
extern void K_inqsema(struct k_args *);
extern void K_lockreq(struct k_args *);
extern void K_lockrpl(struct k_args *);
extern void _k_mutex_lock_reply(struct k_args *);
extern void K_unlock(struct k_args *);
extern void K_enqreq(struct k_args *);
extern void K_enqrpl(struct k_args *);

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

@ -34,7 +34,7 @@
#define KRES_H
extern void K_lockreq(struct k_args *A);
extern void K_lockrpl(struct k_args *A);
extern void _k_mutex_lock_reply(struct k_args *A);
extern void K_unlock(struct k_args *A);
#endif

8
kernel/microkernel/k_mutex.c
View file

@ -64,7 +64,7 @@ NOMANUAL
/*******************************************************************************
*
* K_lockrpl - reply to a mutex lock request (LOCK_TMO, LOCK_RPL)
* _k_mutex_lock_reply - reply to a mutex lock request (LOCK_TMO, LOCK_RPL)
*
* This routine replies to a mutex lock request. This will occur if either
* the waiting task times out or acquires the mutex lock.
@ -74,7 +74,7 @@ NOMANUAL
* \NOMANUAL
*/
void K_lockrpl(
void _k_mutex_lock_reply(
struct k_args *A /* pointer to mutex lock reply request arguments */
)
{
@ -222,7 +222,7 @@ void K_lockreq(struct k_args *A /* pointer to mutex lock
A->Time.timer = NULL;
} else {
/*
* Prepare to call K_lockrpl() should
* Prepare to call _k_mutex_lock_reply() should
* the request time out.
*/
A->Comm = LOCK_TMO;
@ -359,7 +359,7 @@ void K_unlock(struct k_args *A /* pointer to mutex unlock
#ifndef LITE
if (X->Time.timer) {
/*
* Trigger a call to K_lockrpl()--it will
* Trigger a call to _k_mutex_lock_reply()--it will
* send a reply with a return code of RC_OK.
*/
force_timeout(X);

4
scripts/sysgen.py
View file

@ -776,8 +776,8 @@ def kernel_main_c_kernel_services():
"/* 19 */ K_waitmtmo,", # depends on semaphores and timers
"/* 20 */ K_inqsema,", # depends on semaphores
"/* 21 */ K_lockreq,", # depends on mutexes
"/* 22 */ K_lockrpl,", # depends on mutexes
"/* 23 */ K_lockrpl,", # depends on mutexes and timers
"/* 22 */ _k_mutex_lock_reply,", # depends on mutexes
"/* 23 */ _k_mutex_lock_reply,", # depends on mutexes and timers
"/* 24 */ K_unlock,", # depends on mutexes
"/* 25 */ K_enqreq,", # depends on FIFOs
"/* 26 */ K_enqrpl,", # depends on FIFOs