From ec1dd8584636f98b716fcc4fb6607e0fc5c237c3 Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Tue, 28 Apr 2015 11:35:50 -0700 Subject: [PATCH] Renaming K_lockreq to _k_mutex_lock_request 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: I0113be3f432d96857cea651d22ebf9822117101f Signed-off-by: Dan Kalowsky --- include/microkernel/entries.h | 2 +- kernel/microkernel/include/kres.h | 2 +- kernel/microkernel/k_mutex.c | 4 ++-- scripts/sysgen.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/microkernel/entries.h b/include/microkernel/entries.h index b08e21c50dc..81b3c4922b2 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -60,7 +60,7 @@ extern void K_waitmacc(struct k_args *); 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_mutex_lock_request(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 *); diff --git a/kernel/microkernel/include/kres.h b/kernel/microkernel/include/kres.h index 4ad03cae4b4..b37005dbe28 100644 --- a/kernel/microkernel/include/kres.h +++ b/kernel/microkernel/include/kres.h @@ -33,7 +33,7 @@ #ifndef KRES_H #define KRES_H -extern void K_lockreq(struct k_args *A); +extern void _k_mutex_lock_request(struct k_args *A); extern void _k_mutex_lock_reply(struct k_args *A); extern void K_unlock(struct k_args *A); diff --git a/kernel/microkernel/k_mutex.c b/kernel/microkernel/k_mutex.c index db13a35de2b..ad8f7fe8418 100644 --- a/kernel/microkernel/k_mutex.c +++ b/kernel/microkernel/k_mutex.c @@ -143,7 +143,7 @@ void _k_mutex_lock_reply( /******************************************************************************* * -* K_lockreq - process a mutex lock request +* _k_mutex_lock_request - process a mutex lock request * * This routine processes a mutex lock request (LOCK_REQ). If the mutex * is already locked, and the timeout is non-zero then the priority inheritance @@ -154,7 +154,7 @@ void _k_mutex_lock_reply( * \NOMANUAL */ -void K_lockreq(struct k_args *A /* pointer to mutex lock +void _k_mutex_lock_request(struct k_args *A /* pointer to mutex lock request arguments */ ) { diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 75346437811..1d780ca92d7 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -775,7 +775,7 @@ def kernel_main_c_kernel_services(): "/* 18 */ K_waitmend,", # depends on semaphores "/* 19 */ K_waitmtmo,", # depends on semaphores and timers "/* 20 */ K_inqsema,", # depends on semaphores -"/* 21 */ K_lockreq,", # depends on mutexes +"/* 21 */ _k_mutex_lock_request,", # depends on mutexes "/* 22 */ _k_mutex_lock_reply,", # depends on mutexes "/* 23 */ _k_mutex_lock_reply,", # depends on mutexes and timers "/* 24 */ K_unlock,", # depends on mutexes