From e960e23410b80a3cf265112dd6f5ff8f5f2300ea Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Mon, 27 Apr 2015 10:28:25 -0500 Subject: [PATCH] Rename K_QueList to _k_fifo_list 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: I8996c427a98f542052b40bcc9f623c05f6d9bb21 Signed-off-by: Yonattan Louise --- kernel/microkernel/include/minik.h | 2 +- kernel/microkernel/k_queue.c | 6 +++--- scripts/sysgen.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/microkernel/include/minik.h b/kernel/microkernel/include/minik.h index 527f7269f48..0f88d8395ef 100644 --- a/kernel/microkernel/include/minik.h +++ b/kernel/microkernel/include/minik.h @@ -50,7 +50,7 @@ extern struct map_struct _k_mem_map_list[]; extern struct mbx_struct _k_mbox_list[]; extern struct mutex_struct _k_mutex_list[]; extern struct sem_struct _k_sem_list[]; -extern struct que_struct K_QueList[]; +extern struct que_struct _k_fifo_list[]; extern struct pool_struct K_PoolList[]; extern struct pipe_struct K_PipeList[]; diff --git a/kernel/microkernel/k_queue.c b/kernel/microkernel/k_queue.c index 2716f19ac6c..39a22e14f8b 100644 --- a/kernel/microkernel/k_queue.c +++ b/kernel/microkernel/k_queue.c @@ -70,7 +70,7 @@ void K_enqreq(struct k_args *A) char *p, *q; /* Ski char->uint32_t ??? */ Qid = A->Args.q1.queue; - Q = K_QueList + OBJ_INDEX(Qid); + Q = _k_fifo_list + OBJ_INDEX(Qid); w = OCTET_TO_SIZEOFUNIT(Q->Esize); q = A->Args.q1.data; n = Q->Nused; @@ -193,7 +193,7 @@ void K_deqreq(struct k_args *A) char *p, *q; /* idem */ Qid = A->Args.q1.queue; - Q = K_QueList + OBJ_INDEX(Qid); + Q = _k_fifo_list + OBJ_INDEX(Qid); w = OCTET_TO_SIZEOFUNIT(Q->Esize); p = A->Args.q1.data; n = Q->Nused; @@ -299,7 +299,7 @@ void K_queue(struct k_args *A) int Qid; Qid = A->Args.q1.queue; - Q = K_QueList + OBJ_INDEX(Qid); + Q = _k_fifo_list + OBJ_INDEX(Qid); if (A->Args.q1.size) { if (Q->Nused) { struct k_args *X; diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 9210c5eca8c..4834b87a8cb 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -538,7 +538,7 @@ def kernel_main_c_fifos(): total_fifos = len(fifo_list) if (total_fifos == 0): - kernel_main_c_out("\nstruct que_struct * K_QueList = NULL;\n") + kernel_main_c_out("\nstruct que_struct * _k_fifo_list = NULL;\n") return # FIFO buffers @@ -552,7 +552,7 @@ def kernel_main_c_fifos(): # FIFO descriptors kernel_main_c_out("\n" + - "struct que_struct K_QueList[%s] =\n" % (total_fifos) + + "struct que_struct _k_fifo_list[%s] =\n" % (total_fifos) + "{\n" ) for fifo in fifo_list: