From f282dbcb1f3e88d99f7a2eb514a8fe23ffd64ba8 Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Mon, 27 Apr 2015 10:28:27 -0500 Subject: [PATCH] Rename K_PipeCount to _k_pipe_count Updating global variable's name to follow a consistent naming convention. Change accomplished with the following script: #!/bin/bash echo "Searching for ${1} to replace with ${2}" find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" \) \ ! -path "./host/src/genIdt/*" \ ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g'; Change-Id: I10a1bff593c56cf6703920b9feccd10e32cc65ef Signed-off-by: Yonattan Louise --- include/microkernel.h | 2 +- kernel/microkernel/channel/InitChan.c | 2 +- kernel/microkernel/include/minik.h | 2 +- scripts/sysgen.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/microkernel.h b/include/microkernel.h index b4a4a31a9fb..b680c91487a 100644 --- a/include/microkernel.h +++ b/include/microkernel.h @@ -82,7 +82,7 @@ extern int K_StackSize; extern int _k_task_count; extern int _k_mem_map_count; extern int _k_mem_pool_count; -extern int K_PipeCount; +extern int _k_pipe_count; extern const int K_max_eventnr; extern PFN_CHANNEL_RWT pKS_Channel_PutWT; diff --git a/kernel/microkernel/channel/InitChan.c b/kernel/microkernel/channel/InitChan.c index 86e6bbcbd15..849f98e4223 100644 --- a/kernel/microkernel/channel/InitChan.c +++ b/kernel/microkernel/channel/InitChan.c @@ -43,7 +43,7 @@ void InitPipe(void) int i; struct pipe_struct *pPipe; - for (i = 0, pPipe = _k_pipe_list; i < K_PipeCount; i++, pPipe++) { + for (i = 0, pPipe = _k_pipe_list; i < _k_pipe_count; i++, pPipe++) { pPipe->Readers = NULL; pPipe->Writers = NULL; BuffInit((unsigned char *)pPipe->Buffer, diff --git a/kernel/microkernel/include/minik.h b/kernel/microkernel/include/minik.h index 9edc6a70cae..5b09bcf943e 100644 --- a/kernel/microkernel/include/minik.h +++ b/kernel/microkernel/include/minik.h @@ -58,7 +58,7 @@ extern struct pipe_struct _k_pipe_list[]; extern int _k_mem_map_count; #endif extern int _k_mem_pool_count; -extern int K_PipeCount; +extern int _k_pipe_count; extern struct k_proc *K_Task; extern uint32_t K_PrioBitMap[]; diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 003e55525c6..a2b611c7e65 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -574,7 +574,7 @@ def kernel_main_c_pipes(): # pipe global variables - kernel_main_c_out("\nint K_PipeCount = %d;\n" % (total_pipes)) + kernel_main_c_out("\nint _k_pipe_count = %d;\n" % (total_pipes)) if (total_pipes == 0): kernel_main_c_out("\nstruct pipe_struct * _k_pipe_list = NULL;\n")