diff --git a/include/microkernel/entries.h b/include/microkernel/entries.h index 02de332d874..b08e21c50dc 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -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 *); diff --git a/kernel/microkernel/include/kres.h b/kernel/microkernel/include/kres.h index 04fce917a87..4ad03cae4b4 100644 --- a/kernel/microkernel/include/kres.h +++ b/kernel/microkernel/include/kres.h @@ -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 diff --git a/kernel/microkernel/k_mutex.c b/kernel/microkernel/k_mutex.c index 9904173b146..db13a35de2b 100644 --- a/kernel/microkernel/k_mutex.c +++ b/kernel/microkernel/k_mutex.c @@ -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); diff --git a/scripts/sysgen.py b/scripts/sysgen.py index ae8f5384f10..75346437811 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -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