From 10aaf5aefa7a328fcf3817f8d65b14d38ab06cbb Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Tue, 28 Apr 2015 11:35:50 -0700 Subject: [PATCH] Renaming K_deqrpl to _k_fifo_deque_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: 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: Ic3f0816ebc4e7df7bfdb90005d774abd748d14af Signed-off-by: Dan Kalowsky --- include/microkernel/entries.h | 2 +- kernel/microkernel/include/kfifo.h | 2 +- kernel/microkernel/k_queue.c | 4 ++-- scripts/sysgen.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/microkernel/entries.h b/include/microkernel/entries.h index 800a115e1fd..831c6d5ba4d 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -66,7 +66,7 @@ extern void K_unlock(struct k_args *); extern void _k_fifo_enque_request(struct k_args *); extern void _k_fifo_enque_reply(struct k_args *); extern void K_deqreq(struct k_args *); -extern void K_deqrpl(struct k_args *); +extern void _k_fifo_deque_reply(struct k_args *); extern void K_queue(struct k_args *); extern void _k_mbox_send_request(struct k_args *); extern void _k_mbox_send_reply(struct k_args *); diff --git a/kernel/microkernel/include/kfifo.h b/kernel/microkernel/include/kfifo.h index 2f8923b052c..51450e7d069 100644 --- a/kernel/microkernel/include/kfifo.h +++ b/kernel/microkernel/include/kfifo.h @@ -34,7 +34,7 @@ #define KFIFO_H extern void _k_fifo_enque_reply(struct k_args *A); -extern void K_deqrpl(struct k_args *A); +extern void _k_fifo_deque_reply(struct k_args *A); extern void _k_fifo_enque_request(struct k_args *A); extern void K_deqreq(struct k_args *A); extern void K_queue(struct k_args *A); diff --git a/kernel/microkernel/k_queue.c b/kernel/microkernel/k_queue.c index 55ed7d12669..cd11209ea38 100644 --- a/kernel/microkernel/k_queue.c +++ b/kernel/microkernel/k_queue.c @@ -159,12 +159,12 @@ int _task_fifo_put(kfifo_t queue, /* FIFO queue */ /******************************************************************************* * -* K_deqrpl - finish performing an incomplete FIFO dequeue request +* _k_fifo_deque_reply - finish performing an incomplete FIFO dequeue request * * RETURNS: N/A */ -void K_deqrpl(struct k_args *A) +void _k_fifo_deque_reply(struct k_args *A) { if (A->Time.timer) FREETIMER(A->Time.timer); diff --git a/scripts/sysgen.py b/scripts/sysgen.py index fc7a251bcff..07c971fba3d 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -783,8 +783,8 @@ def kernel_main_c_kernel_services(): "/* 26 */ _k_fifo_enque_reply,", # depends on FIFOs "/* 27 */ _k_fifo_enque_reply,", # depends on FIFOs and timers "/* 28 */ K_deqreq,", # depends on FIFOs -"/* 29 */ K_deqrpl,", # depends on FIFOs -"/* 30 */ K_deqrpl,", # depends on FIFOs and timers +"/* 29 */ _k_fifo_deque_reply,", # depends on FIFOs +"/* 30 */ _k_fifo_deque_reply,", # depends on FIFOs and timers "/* 31 */ K_queue,", # depends on FIFOs "/* 32 */ _k_mbox_send_request,", # depends on mailboxes "/* 33 */ _k_mbox_send_reply,", # depends on mailboxes and timers