diff --git a/kernel/microkernel/include/minik.h b/kernel/microkernel/include/minik.h index be366b03a91..527f7269f48 100644 --- a/kernel/microkernel/include/minik.h +++ b/kernel/microkernel/include/minik.h @@ -49,7 +49,7 @@ extern struct map_struct _k_mem_map_list[]; #endif extern struct mbx_struct _k_mbox_list[]; extern struct mutex_struct _k_mutex_list[]; -extern struct sem_struct K_SemList[]; +extern struct sem_struct _k_sem_list[]; extern struct que_struct K_QueList[]; extern struct pool_struct K_PoolList[]; extern struct pipe_struct K_PipeList[]; diff --git a/kernel/microkernel/k_sema.c b/kernel/microkernel/k_sema.c index 49213df0e01..ba854ff271b 100644 --- a/kernel/microkernel/k_sema.c +++ b/kernel/microkernel/k_sema.c @@ -130,7 +130,7 @@ void K_waitmend(struct k_args *R) void K_waitmcan(struct k_args *A) { - struct sem_struct *S = K_SemList + OBJ_INDEX(A->Args.s1.sema); + struct sem_struct *S = _k_sem_list + OBJ_INDEX(A->Args.s1.sema); struct k_args *X = S->Waiters; struct k_args *Y = NULL; @@ -194,7 +194,7 @@ void K_waitmcan(struct k_args *A) void K_waitmacc(struct k_args *A) { - struct sem_struct *S = K_SemList + OBJ_INDEX(A->Args.s1.sema); + struct sem_struct *S = _k_sem_list + OBJ_INDEX(A->Args.s1.sema); struct k_args *X = S->Waiters; struct k_args *Y = NULL; @@ -302,7 +302,7 @@ void K_waitsrpl(struct k_args *A) void K_waitmreq(struct k_args *A) { - struct sem_struct *S = K_SemList + OBJ_INDEX(A->Args.s1.sema); + struct sem_struct *S = _k_sem_list + OBJ_INDEX(A->Args.s1.sema); struct k_args *X = S->Waiters; struct k_args *Y = NULL; @@ -391,7 +391,7 @@ void K_waitsreq(struct k_args *A) uint32_t Sid; Sid = A->Args.s1.sema; - S = K_SemList + OBJ_INDEX(Sid); + S = _k_sem_list + OBJ_INDEX(Sid); if (S->Level) { S->Level--; @@ -475,7 +475,7 @@ void K_signals(struct k_args *A) { uint32_t Sid = A->Args.s1.sema; - signal_semaphore(1, K_SemList + OBJ_INDEX(Sid)); + signal_semaphore(1, _k_sem_list + OBJ_INDEX(Sid)); } /******************************************************************************* @@ -595,7 +595,7 @@ void K_resets(struct k_args *A) { uint32_t Sid = A->Args.s1.sema; - K_SemList[OBJ_INDEX(Sid)].Level = 0; + _k_sem_list[OBJ_INDEX(Sid)].Level = 0; } /******************************************************************************* @@ -666,7 +666,7 @@ void K_inqsema(struct k_args *A) uint32_t Sid; Sid = A->Args.s1.sema; - S = K_SemList + OBJ_INDEX(Sid); + S = _k_sem_list + OBJ_INDEX(Sid); A->Time.rcode = S->Level; } diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 9811cab278e..9210c5eca8c 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -519,13 +519,13 @@ def kernel_main_c_semas(): total_semas = len(sema_list) if (total_semas == 0): - kernel_main_c_out("\nstruct sem_struct * K_SemList = NULL;\n") + kernel_main_c_out("\nstruct sem_struct * _k_sem_list = NULL;\n") return # semaphore descriptors kernel_main_c_out("\n" + - "struct sem_struct K_SemList[%s] =\n" % (total_semas) + + "struct sem_struct _k_sem_list[%s] =\n" % (total_semas) + "{\n") for semaphore in sema_list: kernel_main_c_out(" {NULL, 0, 0},\n")