From 65ffb9e81ef3dc717a99a36b1731fb24d54e63a2 Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Mon, 27 Apr 2015 10:28:24 -0500 Subject: [PATCH] Rename K_MbxList to _k_mbox_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: Ibe83bc837cdae54cf553b80efd989ad321447873 Signed-off-by: Yonattan Louise --- kernel/microkernel/include/minik.h | 2 +- kernel/microkernel/k_mbox.c | 4 ++-- scripts/sysgen.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/microkernel/include/minik.h b/kernel/microkernel/include/minik.h index 3f4b26ebbbb..bb00df96270 100644 --- a/kernel/microkernel/include/minik.h +++ b/kernel/microkernel/include/minik.h @@ -47,7 +47,7 @@ extern int _k_task_count; #ifndef LITE extern struct map_struct _k_mem_map_list[]; #endif -extern struct mbx_struct K_MbxList[]; +extern struct mbx_struct _k_mbox_list[]; extern struct mutex_struct K_MutexList[]; extern struct sem_struct K_SemList[]; extern struct que_struct K_QueList[]; diff --git a/kernel/microkernel/k_mbox.c b/kernel/microkernel/k_mbox.c index 65e12d8351f..410c833f889 100644 --- a/kernel/microkernel/k_mbox.c +++ b/kernel/microkernel/k_mbox.c @@ -342,7 +342,7 @@ void K_sendreq(struct k_args *Writer) Writer->Ctxt.proc = sender; - MailBox = K_MbxList + OBJ_INDEX(MailBoxId); + MailBox = _k_mbox_list + OBJ_INDEX(MailBoxId); copypacket(&CopyWriter, Writer); @@ -580,7 +580,7 @@ void K_recvreq(struct k_args *Reader) CopyReader->Forw = NULL; - MailBox = K_MbxList + OBJ_INDEX(MailBoxId); + MailBox = _k_mbox_list + OBJ_INDEX(MailBoxId); for (CopyWriter = MailBox->Writers, temp = NULL; CopyWriter != NULL; temp = CopyWriter, CopyWriter = CopyWriter->Forw) { diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 869a4f0c1eb..8723ec8f124 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -612,13 +612,13 @@ def kernel_main_c_mailboxes(): total_mbxs = len(mbx_list) if (total_mbxs == 0): - kernel_main_c_out("\nstruct mbx_struct * K_MbxList = NULL;\n") + kernel_main_c_out("\nstruct mbx_struct * _k_mbox_list = NULL;\n") return # mailbox descriptors kernel_main_c_out("\n" + - "struct mbx_struct K_MbxList[%d] =\n" % (total_mbxs) + + "struct mbx_struct _k_mbox_list[%d] =\n" % (total_mbxs) + "{\n") for mbx in mbx_list: kernel_main_c_out(" {NULL, NULL, 0},\n")