diff options
Diffstat (limited to 'nuttx/arch/z16/src')
-rw-r--r-- | nuttx/arch/z16/src/common/up_assert.c | 6 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_blocktask.c | 8 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_createstack.c | 4 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_exit.c | 6 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_initialstate.c | 2 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_releasepending.c | 6 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_releasestack.c | 2 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_reprioritizertr.c | 8 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_schedulesigaction.c | 4 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_sigdeliver.c | 2 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_stackdump.c | 4 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_unblocktask.c | 8 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_usestack.c | 4 |
13 files changed, 32 insertions, 32 deletions
diff --git a/nuttx/arch/z16/src/common/up_assert.c b/nuttx/arch/z16/src/common/up_assert.c index 661d88833..06c77a73e 100644 --- a/nuttx/arch/z16/src/common/up_assert.c +++ b/nuttx/arch/z16/src/common/up_assert.c @@ -81,7 +81,7 @@ static void _up_assert(int errorcode) /* noreturn_function */ { /* Are we in an interrupt handler or the idle task? */ - if (up_interrupt_context() || ((FAR _TCB*)g_readytorun.head)->pid == 0) + if (up_interrupt_context() || ((FAR struct tcb_s*)g_readytorun.head)->pid == 0) { (void)irqsave(); for(;;) @@ -115,7 +115,7 @@ void up_assert(void) #endif { #if CONFIG_TASK_NAME_SIZE > 0 - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; #endif up_ledon(LED_ASSERTION); @@ -152,7 +152,7 @@ void up_assert_code(int errorcode) #endif { #if CONFIG_TASK_NAME_SIZE > 0 - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; #endif up_ledon(LED_ASSERTION); diff --git a/nuttx/arch/z16/src/common/up_blocktask.c b/nuttx/arch/z16/src/common/up_blocktask.c index 88b422cf8..93efee96f 100644 --- a/nuttx/arch/z16/src/common/up_blocktask.c +++ b/nuttx/arch/z16/src/common/up_blocktask.c @@ -84,7 +84,7 @@ * ****************************************************************************/ -void up_block_task(FAR _TCB *tcb, tstate_t task_state) +void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state) { /* Verify that the context switch can be performed */ @@ -95,7 +95,7 @@ void up_block_task(FAR _TCB *tcb, tstate_t task_state) } else { - FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; + FAR struct tcb_s *rtcb = (FAR struct tcb_s*)g_readytorun.head; bool switch_needed; /* dbg("Blocking TCB=%p\n", tcb); */ @@ -140,7 +140,7 @@ void up_block_task(FAR _TCB *tcb, tstate_t task_state) * of the g_readytorun task list. */ - rtcb = (FAR _TCB*)g_readytorun.head; + rtcb = (FAR struct tcb_s*)g_readytorun.head; /* dbg("New Active Task TCB=%p\n", rtcb); */ /* Then setup so that the context will be performed on exit @@ -161,7 +161,7 @@ void up_block_task(FAR _TCB *tcb, tstate_t task_state) * of the g_readytorun task list. */ - rtcb = (FAR _TCB*)g_readytorun.head; + rtcb = (FAR struct tcb_s*)g_readytorun.head; /* dbg("New Active Task TCB=%p\n", rtcb); */ /* Then switch contexts */ diff --git a/nuttx/arch/z16/src/common/up_createstack.c b/nuttx/arch/z16/src/common/up_createstack.c index ed9b1655c..a65c69917 100644 --- a/nuttx/arch/z16/src/common/up_createstack.c +++ b/nuttx/arch/z16/src/common/up_createstack.c @@ -84,7 +84,7 @@ * must be allocated. ****************************************************************************/ -int up_create_stack(_TCB *tcb, size_t stack_size) +int up_create_stack(struct tcb_s *tcb, size_t stack_size) { if (tcb->stack_alloc_ptr && tcb->adj_stack_size != stack_size) @@ -120,7 +120,7 @@ int up_create_stack(_TCB *tcb, size_t stack_size) top_of_stack &= ~3; size_of_stack = top_of_stack - (uint32_t)tcb->stack_alloc_ptr + 4; - /* Save the adjusted stack values in the _TCB */ + /* Save the adjusted stack values in the struct tcb_s */ tcb->adj_stack_ptr = (uint32_t*)top_of_stack; tcb->adj_stack_size = size_of_stack; diff --git a/nuttx/arch/z16/src/common/up_exit.c b/nuttx/arch/z16/src/common/up_exit.c index 20b808360..59764484f 100644 --- a/nuttx/arch/z16/src/common/up_exit.c +++ b/nuttx/arch/z16/src/common/up_exit.c @@ -75,7 +75,7 @@ ****************************************************************************/ #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG) -static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg) +static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg) { #if CONFIG_NFILE_DESCRIPTORS > 0 FAR struct filelist *filelist; @@ -138,7 +138,7 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg) void _exit(int status) { - FAR _TCB* tcb; + FAR struct tcb_s* tcb; /* Disable interrupts. Interrupts will remain disabled until * the new task is resumed below. @@ -161,7 +161,7 @@ void _exit(int status) * head of the list. */ - tcb = (FAR _TCB*)g_readytorun.head; + tcb = (FAR struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", tcb); /* Then switch contexts */ diff --git a/nuttx/arch/z16/src/common/up_initialstate.c b/nuttx/arch/z16/src/common/up_initialstate.c index 8938679ac..50ff3f133 100644 --- a/nuttx/arch/z16/src/common/up_initialstate.c +++ b/nuttx/arch/z16/src/common/up_initialstate.c @@ -76,7 +76,7 @@ * ****************************************************************************/ -void up_initial_state(_TCB *tcb) +void up_initial_state(struct tcb_s *tcb) { uint32_t *reg32 = (uint32_t*)tcb->xcp.regs; diff --git a/nuttx/arch/z16/src/common/up_releasepending.c b/nuttx/arch/z16/src/common/up_releasepending.c index ff9a9782e..a25459730 100644 --- a/nuttx/arch/z16/src/common/up_releasepending.c +++ b/nuttx/arch/z16/src/common/up_releasepending.c @@ -77,7 +77,7 @@ void up_release_pending(void) { - FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; + FAR struct tcb_s *rtcb = (FAR struct tcb_s*)g_readytorun.head; slldbg("From TCB=%p\n", rtcb); @@ -103,7 +103,7 @@ void up_release_pending(void) * of the g_readytorun task list. */ - rtcb = (FAR _TCB*)g_readytorun.head; + rtcb = (FAR struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then setup so that the context will be performed on exit @@ -125,7 +125,7 @@ void up_release_pending(void) * of the g_readytorun task list. */ - rtcb = (FAR _TCB*)g_readytorun.head; + rtcb = (FAR struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then switch contexts */ diff --git a/nuttx/arch/z16/src/common/up_releasestack.c b/nuttx/arch/z16/src/common/up_releasestack.c index f064cae7f..82ba1b122 100644 --- a/nuttx/arch/z16/src/common/up_releasestack.c +++ b/nuttx/arch/z16/src/common/up_releasestack.c @@ -67,7 +67,7 @@ * ************************************************************/ -void up_release_stack(_TCB *dtcb) +void up_release_stack(struct tcb_s *dtcb) { if (dtcb->stack_alloc_ptr) { diff --git a/nuttx/arch/z16/src/common/up_reprioritizertr.c b/nuttx/arch/z16/src/common/up_reprioritizertr.c index 6e76d6ce1..2eb5c2cdb 100644 --- a/nuttx/arch/z16/src/common/up_reprioritizertr.c +++ b/nuttx/arch/z16/src/common/up_reprioritizertr.c @@ -86,7 +86,7 @@ * ****************************************************************************/ -void up_reprioritize_rtr(FAR _TCB *tcb, uint8_t priority) +void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority) { /* Verify that the caller is sane */ @@ -104,7 +104,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, uint8_t priority) } else { - FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; + FAR struct tcb_s *rtcb = (FAR struct tcb_s*)g_readytorun.head; bool switch_needed; slldbg("TCB=%p PRI=%d\n", tcb, priority); @@ -158,7 +158,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, uint8_t priority) * of the g_readytorun task list. */ - rtcb = (FAR _TCB*)g_readytorun.head; + rtcb = (FAR struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then setup so that the context will be performed on exit @@ -179,7 +179,7 @@ void up_reprioritize_rtr(FAR _TCB *tcb, uint8_t priority) * of the g_readytorun task list. */ - rtcb = (FAR _TCB*)g_readytorun.head; + rtcb = (FAR struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then switch contexts */ diff --git a/nuttx/arch/z16/src/common/up_schedulesigaction.c b/nuttx/arch/z16/src/common/up_schedulesigaction.c index 1c5b9a78c..b241d0a5b 100644 --- a/nuttx/arch/z16/src/common/up_schedulesigaction.c +++ b/nuttx/arch/z16/src/common/up_schedulesigaction.c @@ -100,7 +100,7 @@ * ****************************************************************************/ -void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver) +void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) { /* Refuse to handle nested signal actions */ @@ -120,7 +120,7 @@ void up_schedule_sigaction(FAR _TCB *tcb, sig_deliver_t sigdeliver) dbg("rtcb=0x%p current_regs=0x%p\n", g_readytorun.head, current_regs); - if (tcb == (FAR _TCB*)g_readytorun.head) + if (tcb == (FAR struct tcb_s*)g_readytorun.head) { /* CASE 1: We are not in an interrupt handler and * a task is signalling itself for some reason. diff --git a/nuttx/arch/z16/src/common/up_sigdeliver.c b/nuttx/arch/z16/src/common/up_sigdeliver.c index d8636bd6f..8f5118798 100644 --- a/nuttx/arch/z16/src/common/up_sigdeliver.c +++ b/nuttx/arch/z16/src/common/up_sigdeliver.c @@ -81,7 +81,7 @@ void up_sigdeliver(void) { #ifndef CONFIG_DISABLE_SIGNALS - FAR _TCB *rtcb = (_TCB*)g_readytorun.head; + FAR struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; chipreg_t regs[XCPTCONTEXT_REGS]; FAR uint32_t *regs32 = (FAR uint32_t*)regs; sig_deliver_t sigdeliver; diff --git a/nuttx/arch/z16/src/common/up_stackdump.c b/nuttx/arch/z16/src/common/up_stackdump.c index 077b0c8f7..ef9eebb23 100644 --- a/nuttx/arch/z16/src/common/up_stackdump.c +++ b/nuttx/arch/z16/src/common/up_stackdump.c @@ -78,8 +78,8 @@ #ifdef CONFIG_ARCH_STACKDUMP static void up_stackdump(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; - chipreg_t sp = up_getsp(); + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; + chipreg_t sp = up_getsp(); chipreg_t stack_base = (chipreg_t)rtcb->adj_stack_ptr; chipreg_t stack_size = (chipreg_t)rtcb->adj_stack_size; diff --git a/nuttx/arch/z16/src/common/up_unblocktask.c b/nuttx/arch/z16/src/common/up_unblocktask.c index d72d55424..f63981ab5 100644 --- a/nuttx/arch/z16/src/common/up_unblocktask.c +++ b/nuttx/arch/z16/src/common/up_unblocktask.c @@ -81,7 +81,7 @@ * ****************************************************************************/ -void up_unblock_task(FAR _TCB *tcb) +void up_unblock_task(FAR struct tcb_s *tcb) { /* Verify that the context switch can be performed */ @@ -92,7 +92,7 @@ void up_unblock_task(FAR _TCB *tcb) } else { - FAR _TCB *rtcb = (FAR _TCB*)g_readytorun.head; + FAR struct tcb_s *rtcb = (FAR struct tcb_s*)g_readytorun.head; /* dbg("Unblocking TCB=%p\n", tcb); */ @@ -132,7 +132,7 @@ void up_unblock_task(FAR _TCB *tcb) * of the g_readytorun task list. */ - rtcb = (FAR _TCB*)g_readytorun.head; + rtcb = (FAR struct tcb_s*)g_readytorun.head; /* dbg("New Active Task TCB=%p\n", rtcb); */ /* Then setup so that the context will be performed on exit @@ -155,7 +155,7 @@ void up_unblock_task(FAR _TCB *tcb) * g_readytorun task list. */ - rtcb = (FAR _TCB*)g_readytorun.head; + rtcb = (FAR struct tcb_s*)g_readytorun.head; /* dbg("New Active Task TCB=%p\n", rtcb); */ /* Then switch contexts */ diff --git a/nuttx/arch/z16/src/common/up_usestack.c b/nuttx/arch/z16/src/common/up_usestack.c index 69e4763c5..9ebe01de4 100644 --- a/nuttx/arch/z16/src/common/up_usestack.c +++ b/nuttx/arch/z16/src/common/up_usestack.c @@ -82,7 +82,7 @@ * ************************************************************/ -int up_use_stack(_TCB *tcb, void *stack, size_t stack_size) +int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size) { size_t top_of_stack; size_t size_of_stack; @@ -113,7 +113,7 @@ int up_use_stack(_TCB *tcb, void *stack, size_t stack_size) top_of_stack &= ~3; size_of_stack = top_of_stack - (uint32_t)tcb->stack_alloc_ptr + 4; - /* Save the adjusted stack values in the _TCB */ + /* Save the adjusted stack values in the struct tcb_s */ tcb->adj_stack_size = top_of_stack; tcb->adj_stack_size = size_of_stack; |