From 839c84666fb709877738172ef52dfc6770dd545f Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Mon, 24 Aug 2015 09:49:20 -0500 Subject: [PATCH] Rename microkernel struct field 'State' to 'state'. Rename field 'State' of the struct: - 'k_proc' in the file include/microkernel/base_api.h Change-Id: I545ad7fa0a9b1f100dfb9a639e6730bee5d30905 Signed-off-by: Yonattan Louise --- include/microkernel/base_api.h | 2 +- kernel/microkernel/k_task.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/microkernel/base_api.h b/include/microkernel/base_api.h index 62243f8deb0..dc87f50b7b8 100644 --- a/include/microkernel/base_api.h +++ b/include/microkernel/base_api.h @@ -110,7 +110,7 @@ struct k_task { struct k_task *prev; kpriority_t priority; ktask_t id; - uint32_t State; + uint32_t state; uint32_t Group; void (*fstart)(void); char *workspace; diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index 8d3c30086b4..7c2d8ad7c41 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -74,10 +74,10 @@ void _k_state_bit_reset(struct k_task *X, /* ptr to task */ bits to reset */ ) { - uint32_t f_old = X->State; /* old state bits */ + uint32_t f_old = X->state; /* old state bits */ uint32_t f_new = f_old & ~bits; /* new state bits */ - X->State = f_new; /* Update task's state bits */ + X->state = f_new; /* Update task's state bits */ if ((f_old != 0) && (f_new == 0)) { /* @@ -126,14 +126,14 @@ void _k_state_bit_set( uint32_t bits /* bitmask of TF_xxx bits to set */ ) { - uint32_t old_state_bits = task_ptr->State; + uint32_t old_state_bits = task_ptr->state; uint32_t new_state_bits = old_state_bits | bits; - task_ptr->State = new_state_bits; + task_ptr->state = new_state_bits; if ((old_state_bits == 0) && (new_state_bits != 0)) { /* - * The task could have been scheduled to run ([State] was 0) + * The task could have been scheduled to run ([state] was 0) * but can not be scheduled to run anymore at least one TF_xxx * bit has been set. Remove it from the list of schedulable * tasks.