From 979b40f77f9e73e00da1d50beda09ccfb9c828b5 Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Tue, 28 Apr 2015 11:35:50 -0700 Subject: [PATCH] Renaming K_deqreq to _k_fifo_deque_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: I7bcf9d9df788caec6d4e4dd29d1c0b58efc87af2 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 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/microkernel/entries.h b/include/microkernel/entries.h index 831c6d5ba4..1749bf15ed 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -65,7 +65,7 @@ extern void _k_mutex_lock_reply(struct k_args *); 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_fifo_deque_request(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 *); diff --git a/kernel/microkernel/include/kfifo.h b/kernel/microkernel/include/kfifo.h index 51450e7d06..b18432fff7 100644 --- a/kernel/microkernel/include/kfifo.h +++ b/kernel/microkernel/include/kfifo.h @@ -36,7 +36,7 @@ extern void _k_fifo_enque_reply(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_fifo_deque_request(struct k_args *A); extern void K_queue(struct k_args *A); #endif diff --git a/kernel/microkernel/k_queue.c b/kernel/microkernel/k_queue.c index cd11209ea3..6b6e06930e 100644 --- a/kernel/microkernel/k_queue.c +++ b/kernel/microkernel/k_queue.c @@ -180,12 +180,12 @@ void _k_fifo_deque_reply(struct k_args *A) /******************************************************************************* * -* K_deqreq - perform FIFO dequeue request +* _k_fifo_deque_request - perform FIFO dequeue request * * RETURNS: N/A */ -void K_deqreq(struct k_args *A) +void _k_fifo_deque_request(struct k_args *A) { struct k_args *W; struct que_struct *Q; diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 07c971fba3..3f4fec1419 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -782,7 +782,7 @@ def kernel_main_c_kernel_services(): "/* 25 */ _k_fifo_enque_request,", # depends on FIFOs "/* 26 */ _k_fifo_enque_reply,", # depends on FIFOs "/* 27 */ _k_fifo_enque_reply,", # depends on FIFOs and timers -"/* 28 */ K_deqreq,", # depends on FIFOs +"/* 28 */ _k_fifo_deque_request,", # depends on FIFOs "/* 29 */ _k_fifo_deque_reply,", # depends on FIFOs "/* 30 */ _k_fifo_deque_reply,", # depends on FIFOs and timers "/* 31 */ K_queue,", # depends on FIFOs