michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename microkernel struct field 'Ident' to 'id'.

Browse source 
Rename field 'Ident' of the struct:
- 'k_proc' in the file include/microkernel/base_api.h

Change-Id: Iec787e0a8aa1791c968b371017cf96211a60cef1
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-08-24 09:42:35 -05:00 • committed by Anas Nashif
commit 617501354c
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/core/task_abort.c
View file

@ -72,10 +72,10 @@ void _TaskAbort(void)
const int taskAbortCode = 1; const int taskAbortCode = 1;
if (_ScbIsInThreadMode()) { if (_ScbIsInThreadMode()) {
_task_ioctl(_k_current_task->Ident, taskAbortCode); _task_ioctl(_k_current_task->id, taskAbortCode);
} else { } else {
cmd_packet.Comm = _K_SVC_TASK_OP; cmd_packet.Comm = _K_SVC_TASK_OP;
cmd_packet.Args.g1.task = _k_current_task->Ident; cmd_packet.Args.g1.task = _k_current_task->id;
cmd_packet.Args.g1.opt = taskAbortCode; cmd_packet.Args.g1.opt = taskAbortCode;
cmd_packet.alloc = false; cmd_packet.alloc = false;
_k_current_task->Args = &cmd_packet; _k_current_task->Args = &cmd_packet;

2
include/microkernel/base_api.h
View file

@ -109,7 +109,7 @@ struct k_task {
struct k_task *next; struct k_task *next;
struct k_task *prev; struct k_task *prev;
kpriority_t priority; kpriority_t priority;
ktask_t Ident; ktask_t id;
uint32_t State; uint32_t State;
uint32_t Group; uint32_t Group;
void (*fstart)(void); void (*fstart)(void);

6
kernel/microkernel/k_mailbox.c
View file

@ -490,7 +490,7 @@ int _task_mbox_put(kmbox_t mbox,
return RC_FAIL; return RC_FAIL;
} }
M->tx_task = _k_current_task->Ident; M->tx_task = _k_current_task->id;
M->tx_block.pool_id = 0; /* NO ASYNC POST */ M->tx_block.pool_id = 0; /* NO ASYNC POST */
M->extra.sema = 0; M->extra.sema = 0;
M->mailbox = mbox; M->mailbox = mbox;
@ -683,7 +683,7 @@ int _task_mbox_get(kmbox_t mbox,
{ {
struct k_args A; struct k_args A;
M->rx_task = _k_current_task->Ident; M->rx_task = _k_current_task->id;
M->mailbox = mbox; M->mailbox = mbox;
M->extra.transfer = 0; M->extra.transfer = 0;
@ -720,7 +720,7 @@ void _task_mbox_block_put(kmbox_t mbox,
M->tx_block.pool_id = (uint32_t)(-1); M->tx_block.pool_id = (uint32_t)(-1);
} }
M->tx_task = _k_current_task->Ident; M->tx_task = _k_current_task->id;
M->tx_data = NULL; M->tx_data = NULL;
M->mailbox = mbox; M->mailbox = mbox;
M->extra.sema = sema; M->extra.sema = sema;

4
kernel/microkernel/k_mutex.c
View file

@ -296,7 +296,7 @@ int _task_mutex_lock(
A.Comm = _K_SVC_MUTEX_LOCK_REQUEST; A.Comm = _K_SVC_MUTEX_LOCK_REQUEST;
A.Time.ticks = time; A.Time.ticks = time;
A.Args.l1.mutex = mutex; A.Args.l1.mutex = mutex;
A.Args.l1.task = _k_current_task->Ident; A.Args.l1.task = _k_current_task->id;
KERNEL_ENTRY(&A); KERNEL_ENTRY(&A);
return A.Time.rcode; return A.Time.rcode;
} }
@ -409,7 +409,7 @@ void _task_mutex_unlock(kmutex_t mutex /* mutex to unlock */
A.Comm = _K_SVC_MUTEX_UNLOCK; A.Comm = _K_SVC_MUTEX_UNLOCK;
A.Args.l1.mutex = mutex; A.Args.l1.mutex = mutex;
A.Args.l1.task = _k_current_task->Ident; A.Args.l1.task = _k_current_task->id;
KERNEL_ENTRY(&A); KERNEL_ENTRY(&A);
} }

4
kernel/microkernel/k_server.c
View file

@ -148,9 +148,9 @@ FUNC_NORETURN void _k_server(int unused1, int unused2)
/* switch from currently selected task to a different one */ /* switch from currently selected task to a different one */
#ifdef CONFIG_WORKLOAD_MONITOR #ifdef CONFIG_WORKLOAD_MONITOR
if (pNextTask->Ident == 0x00000000) { if (pNextTask->id == 0x00000000) {
_k_workload_monitor_idle_start(); _k_workload_monitor_idle_start();
} else if (_k_current_task->Ident == 0x00000000) { } else if (_k_current_task->id == 0x00000000) {
_k_workload_monitor_idle_end(); _k_workload_monitor_idle_end();
} }
#endif #endif

4
kernel/microkernel/k_task.c
View file

@ -54,7 +54,7 @@ extern struct k_task _k_task_list_end[];
ktask_t task_id_get(void) ktask_t task_id_get(void)
{ {
return _k_current_task->Ident; return _k_current_task->id;
} }
/** /**
@ -279,7 +279,7 @@ static void abort_task(struct k_task *X)
FUNC_NORETURN void _TaskAbort(void) FUNC_NORETURN void _TaskAbort(void)
{ {
_task_ioctl(_k_current_task->Ident, TASK_ABORT); _task_ioctl(_k_current_task->id, TASK_ABORT);
/* /*
* Compiler can't tell that _task_ioctl() won't return and issues * Compiler can't tell that _task_ioctl() won't return and issues

6
kernel/microkernel/k_task_monitor.c
View file

@ -63,7 +63,7 @@ void _k_task_monitor(struct k_task *X, uint32_t D)
#endif #endif
{ {
k_monitor_wptr->time = _sys_clock_cycle_get(); k_monitor_wptr->time = _sys_clock_cycle_get();
k_monitor_wptr->data1 = X->Ident; k_monitor_wptr->data1 = X->id;
k_monitor_wptr->data2 = D; k_monitor_wptr->data2 = D;
if (++K_monitor_wind == k_monitor_capacity) { if (++K_monitor_wind == k_monitor_capacity) {
K_monitor_wind = 0; K_monitor_wind = 0;
@ -76,7 +76,7 @@ void _k_task_monitor(struct k_task *X, uint32_t D)
} }
} }
if ((_k_task_switch_callback != NULL) && (D == 0)) { if ((_k_task_switch_callback != NULL) && (D == 0)) {
(_k_task_switch_callback)(X->Ident, _sys_clock_cycle_get()); (_k_task_switch_callback)(X->id, _sys_clock_cycle_get());
} }
} }
@ -91,7 +91,7 @@ void _k_task_monitor_args(struct k_args *A)
if ((uint32_t)A < _k_num_events) { if ((uint32_t)A < _k_num_events) {
k_monitor_wptr->data2 = MO_EVENT | (uint32_t)A; k_monitor_wptr->data2 = MO_EVENT | (uint32_t)A;
} else { } else {
k_monitor_wptr->data1 = _k_current_task->Ident; k_monitor_wptr->data1 = _k_current_task->id;
k_monitor_wptr->data2 = MO_LCOMM | A->Comm; k_monitor_wptr->data2 = MO_LCOMM | A->Comm;
} }