From 88343e969cdcfee2981e12ed65e6dfd94ab450f0 Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Tue, 28 Apr 2015 11:35:49 -0700 Subject: [PATCH] Renaming K_recvrpl to _k_mbox_receive_reply 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}" find . -type f \( -iname \*.c -o -iname \*.h -o -iname \*.s -o -iname \*.kconf \) \ -not \( -path host/src/genIdt -prune \) \ \ -not \( -path host/src/gen_tables -prune \) \ -print | xargs sed -i "s/"${1}"/"${2}"/g" Change-Id: If7f5e78d6dd5492dbbbcc080c2e822f33eb1c967 Signed-off-by: Dan Kalowsky --- include/microkernel/entries.h | 2 +- kernel/microkernel/include/kmail.h | 2 +- kernel/microkernel/k_mbox.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 6744b2fe21e..8336ac2d7c0 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -73,7 +73,7 @@ extern void _k_mbox_send_reply(struct k_args *); extern void _k_mbox_send_ack(struct k_args *); extern void K_senddata(struct k_args *); extern void K_recvreq(struct k_args *); -extern void K_recvrpl(struct k_args *); +extern void _k_mbox_receive_reply(struct k_args *); extern void _k_mbox_receive_ack(struct k_args *); extern void K_recvdata(struct k_args *); extern void K_elapse(struct k_args *); diff --git a/kernel/microkernel/include/kmail.h b/kernel/microkernel/include/kmail.h index 2080846abcd..3811a97f9fa 100644 --- a/kernel/microkernel/include/kmail.h +++ b/kernel/microkernel/include/kmail.h @@ -55,7 +55,7 @@ extern void _k_mbox_send_reply(struct k_args *Writer); extern void _k_mbox_send_request(struct k_args *Writer); extern void _k_mbox_send_ack(struct k_args *Writer); extern void _k_mbox_receive_ack(struct k_args *Reader); -extern void K_recvrpl(struct k_args *Reader); +extern void _k_mbox_receive_reply(struct k_args *Reader); extern void K_recvreq(struct k_args *Reader); extern void K_recvdata(struct k_args *Starter); diff --git a/kernel/microkernel/k_mbox.c b/kernel/microkernel/k_mbox.c index bbe7e721dbd..cf992c1426d 100644 --- a/kernel/microkernel/k_mbox.c +++ b/kernel/microkernel/k_mbox.c @@ -539,12 +539,12 @@ void _k_mbox_receive_ack(struct k_args *pCopyReader) /******************************************************************************* * -* K_recvrpl - process the timeout for a mailbox receive request +* _k_mbox_receive_reply - process the timeout for a mailbox receive request * * RETURNS: N/A */ -void K_recvrpl(struct k_args *pCopyReader) +void _k_mbox_receive_reply(struct k_args *pCopyReader) { FREETIMER(pCopyReader->Time.timer); REMOVE_ELM(pCopyReader); diff --git a/scripts/sysgen.py b/scripts/sysgen.py index e9a257bc39d..3118a79272a 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -791,7 +791,7 @@ def kernel_main_c_kernel_services(): "/* 34 */ _k_mbox_send_ack,", # depends on mailboxes "/* 35 */ K_senddata,", # depends on mailboxes "/* 36 */ K_recvreq,", # depends on mailboxes -"/* 37 */ K_recvrpl,", # depends on mailboxes and timers +"/* 37 */ _k_mbox_receive_reply,", # depends on mailboxes and timers "/* 38 */ _k_mbox_receive_ack,", # depends on mailboxes "/* 39 */ K_recvdata,", # depends on mailboxes "/* 40 */ K_elapse,", # required