From ec121586f07baf2b7f4eda268eee6ab9c280e70a Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Tue, 28 Apr 2015 11:35:50 -0700 Subject: [PATCH] Renaming K_enqreq to _k_fifo_enque_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: Iba93e81cd3daec24831c45d31dfd905327e7ec18 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 f46e81b3a51..800a115e1fd 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -63,7 +63,7 @@ extern void K_inqsema(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 *); +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 *); diff --git a/kernel/microkernel/include/kfifo.h b/kernel/microkernel/include/kfifo.h index dedcfc8ce4c..2f8923b052c 100644 --- a/kernel/microkernel/include/kfifo.h +++ b/kernel/microkernel/include/kfifo.h @@ -35,7 +35,7 @@ extern void _k_fifo_enque_reply(struct k_args *A); extern void K_deqrpl(struct k_args *A); -extern void K_enqreq(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 e8f271f2689..55ed7d12669 100644 --- a/kernel/microkernel/k_queue.c +++ b/kernel/microkernel/k_queue.c @@ -57,12 +57,12 @@ void _k_fifo_enque_reply(struct k_args *A) /******************************************************************************* * -* K_enqreq - perform a FIFO enqueue request +* _k_fifo_enque_request - perform a FIFO enqueue request * * RETURNS: N/A */ -void K_enqreq(struct k_args *A) +void _k_fifo_enque_request(struct k_args *A) { struct k_args *W; struct que_struct *Q; diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 54310f004cf..fc7a251bcff 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -779,7 +779,7 @@ def kernel_main_c_kernel_services(): "/* 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 +"/* 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