diff options
Diffstat (limited to 'nuttx/arch/arm')
28 files changed, 70 insertions, 70 deletions
diff --git a/nuttx/arch/arm/src/arm/up_allocpage.c b/nuttx/arch/arm/src/arm/up_allocpage.c index 0284e48bc..8ec99b09c 100644 --- a/nuttx/arch/arm/src/arm/up_allocpage.c +++ b/nuttx/arch/arm/src/arm/up_allocpage.c @@ -165,7 +165,7 @@ static bool g_pgwrap; * ****************************************************************************/ -int up_allocpage(FAR _TCB *tcb, FAR void **vpage) +int up_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) { uintptr_t vaddr; uintptr_t paddr; diff --git a/nuttx/arch/arm/src/arm/up_assert.c b/nuttx/arch/arm/src/arm/up_assert.c index 5f713c34d..d97aba5ea 100644 --- a/nuttx/arch/arm/src/arm/up_assert.c +++ b/nuttx/arch/arm/src/arm/up_assert.c @@ -161,7 +161,7 @@ static inline void up_registerdump(void) #ifdef CONFIG_ARCH_STACKDUMP static void up_dumpstate(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; uint32_t sp = up_getsp(); uint32_t ustackbase; uint32_t ustacksize; @@ -257,7 +257,7 @@ static void _up_assert(int errorcode) { /* Are we in an interrupt handler or the idle task? */ - if (current_regs || ((_TCB*)g_readytorun.head)->pid == 0) + if (current_regs || ((struct tcb_s*)g_readytorun.head)->pid == 0) { (void)irqsave(); for(;;) @@ -287,7 +287,7 @@ static void _up_assert(int errorcode) void up_assert(const uint8_t *filename, int lineno) { #ifdef CONFIG_PRINT_TASKNAME - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; #endif up_ledon(LED_ASSERTION); @@ -309,7 +309,7 @@ void up_assert(const uint8_t *filename, int lineno) void up_assert_code(const uint8_t *filename, int lineno, int errorcode) { #ifdef CONFIG_PRINT_TASKNAME - _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/arm/src/arm/up_blocktask.c b/nuttx/arch/arm/src/arm/up_blocktask.c index f72a02465..090cc6407 100644 --- a/nuttx/arch/arm/src/arm/up_blocktask.c +++ b/nuttx/arch/arm/src/arm/up_blocktask.c @@ -84,7 +84,7 @@ * ****************************************************************************/ -void up_block_task(_TCB *tcb, tstate_t task_state) +void up_block_task(struct tcb_s *tcb, tstate_t task_state) { /* Verify that the context switch can be performed */ @@ -95,7 +95,7 @@ void up_block_task(_TCB *tcb, tstate_t task_state) } else { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; bool switch_needed; /* Remove the tcb task from the ready-to-run list. If we @@ -138,7 +138,7 @@ void up_block_task(_TCB *tcb, tstate_t task_state) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; /* Then switch contexts */ @@ -156,7 +156,7 @@ void up_block_task(_TCB *tcb, tstate_t task_state) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; /* Then switch contexts */ diff --git a/nuttx/arch/arm/src/arm/up_checkmapping.c b/nuttx/arch/arm/src/arm/up_checkmapping.c index ca8c3a032..f86b6de75 100644 --- a/nuttx/arch/arm/src/arm/up_checkmapping.c +++ b/nuttx/arch/arm/src/arm/up_checkmapping.c @@ -97,7 +97,7 @@ * ****************************************************************************/ -bool up_checkmapping(FAR _TCB *tcb) +bool up_checkmapping(FAR struct tcb_s *tcb) { uintptr_t vaddr; uint32_t *pte; diff --git a/nuttx/arch/arm/src/arm/up_dataabort.c b/nuttx/arch/arm/src/arm/up_dataabort.c index 60ef8385e..99b3bf2ab 100644 --- a/nuttx/arch/arm/src/arm/up_dataabort.c +++ b/nuttx/arch/arm/src/arm/up_dataabort.c @@ -102,9 +102,9 @@ #ifdef CONFIG_PAGING void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) { - FAR _TCB *tcb = (FAR _TCB *)g_readytorun.head; + FAR struct tcb_s *tcb = (FAR struct tcb_s *)g_readytorun.head; #ifdef CONFIG_PAGING - uint32_t *savestate; + uint32_t *savestate; /* Save the saved processor context in current_regs where it can be accessed * for register dumps and possibly context switching. diff --git a/nuttx/arch/arm/src/arm/up_initialstate.c b/nuttx/arch/arm/src/arm/up_initialstate.c index fb672a2ac..7d8ef65b1 100644 --- a/nuttx/arch/arm/src/arm/up_initialstate.c +++ b/nuttx/arch/arm/src/arm/up_initialstate.c @@ -78,7 +78,7 @@ * ****************************************************************************/ -void up_initial_state(_TCB *tcb) +void up_initial_state(struct tcb_s *tcb) { struct xcptcontext *xcp = &tcb->xcp; uint32_t cpsr; diff --git a/nuttx/arch/arm/src/arm/up_prefetchabort.c b/nuttx/arch/arm/src/arm/up_prefetchabort.c index 9d028b0d4..541586de9 100644 --- a/nuttx/arch/arm/src/arm/up_prefetchabort.c +++ b/nuttx/arch/arm/src/arm/up_prefetchabort.c @@ -121,7 +121,7 @@ void up_prefetchabort(uint32_t *regs) * prefetch and data aborts. */ - FAR _TCB *tcb = (FAR _TCB *)g_readytorun.head; + FAR struct tcb_s *tcb = (FAR struct tcb_s *)g_readytorun.head; tcb->xcp.far = regs[REG_R15]; /* Call pg_miss() to schedule the page fill. A consequences of this diff --git a/nuttx/arch/arm/src/arm/up_releasepending.c b/nuttx/arch/arm/src/arm/up_releasepending.c index 8adeeb26d..169262e95 100644 --- a/nuttx/arch/arm/src/arm/up_releasepending.c +++ b/nuttx/arch/arm/src/arm/up_releasepending.c @@ -75,7 +75,7 @@ void up_release_pending(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; slldbg("From TCB=%p\n", rtcb); @@ -101,7 +101,7 @@ void up_release_pending(void) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then switch contexts */ @@ -121,7 +121,7 @@ void up_release_pending(void) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then switch contexts */ diff --git a/nuttx/arch/arm/src/arm/up_reprioritizertr.c b/nuttx/arch/arm/src/arm/up_reprioritizertr.c index 02bc39d62..769794083 100644 --- a/nuttx/arch/arm/src/arm/up_reprioritizertr.c +++ b/nuttx/arch/arm/src/arm/up_reprioritizertr.c @@ -84,7 +84,7 @@ * ****************************************************************************/ -void up_reprioritize_rtr(_TCB *tcb, uint8_t priority) +void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) { /* Verify that the caller is sane */ @@ -102,7 +102,7 @@ void up_reprioritize_rtr(_TCB *tcb, uint8_t priority) } else { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; bool switch_needed; slldbg("TCB=%p PRI=%d\n", tcb, priority); @@ -156,7 +156,7 @@ void up_reprioritize_rtr(_TCB *tcb, uint8_t priority) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then switch contexts */ @@ -175,7 +175,7 @@ void up_reprioritize_rtr(_TCB *tcb, uint8_t priority) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then switch contexts */ diff --git a/nuttx/arch/arm/src/arm/up_schedulesigaction.c b/nuttx/arch/arm/src/arm/up_schedulesigaction.c index a76438f94..f7d33254b 100644 --- a/nuttx/arch/arm/src/arm/up_schedulesigaction.c +++ b/nuttx/arch/arm/src/arm/up_schedulesigaction.c @@ -101,7 +101,7 @@ * ****************************************************************************/ -void up_schedule_sigaction(_TCB *tcb, sig_deliver_t sigdeliver) +void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) { /* Refuse to handle nested signal actions */ @@ -121,7 +121,7 @@ void up_schedule_sigaction(_TCB *tcb, sig_deliver_t sigdeliver) sdbg("rtcb=0x%p current_regs=0x%p\n", g_readytorun.head, current_regs); - if (tcb == (_TCB*)g_readytorun.head) + if (tcb == (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/arm/src/arm/up_sigdeliver.c b/nuttx/arch/arm/src/arm/up_sigdeliver.c index 868449448..9459bf7e9 100644 --- a/nuttx/arch/arm/src/arm/up_sigdeliver.c +++ b/nuttx/arch/arm/src/arm/up_sigdeliver.c @@ -81,7 +81,7 @@ void up_sigdeliver(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; uint32_t regs[XCPTCONTEXT_REGS]; sig_deliver_t sigdeliver; diff --git a/nuttx/arch/arm/src/arm/up_unblocktask.c b/nuttx/arch/arm/src/arm/up_unblocktask.c index 633dc4e82..a2dc0f694 100644 --- a/nuttx/arch/arm/src/arm/up_unblocktask.c +++ b/nuttx/arch/arm/src/arm/up_unblocktask.c @@ -79,7 +79,7 @@ * ****************************************************************************/ -void up_unblock_task(_TCB *tcb) +void up_unblock_task(struct tcb_s *tcb) { /* Verify that the context switch can be performed */ @@ -90,7 +90,7 @@ void up_unblock_task(_TCB *tcb) } else { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; /* Remove the task from the blocked task list */ @@ -128,7 +128,7 @@ void up_unblock_task(_TCB *tcb) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; /* Then switch contexts */ @@ -148,7 +148,7 @@ void up_unblock_task(_TCB *tcb) * g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; /* Then switch contexts */ diff --git a/nuttx/arch/arm/src/armv7-m/up_assert.c b/nuttx/arch/arm/src/armv7-m/up_assert.c index b40b1090c..394c6858f 100644 --- a/nuttx/arch/arm/src/armv7-m/up_assert.c +++ b/nuttx/arch/arm/src/armv7-m/up_assert.c @@ -167,8 +167,8 @@ static inline void up_registerdump(void) #ifdef CONFIG_ARCH_STACKDUMP static void up_dumpstate(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; - uint32_t sp = up_getsp(); + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; + uint32_t sp = up_getsp(); uint32_t ustackbase; uint32_t ustacksize; #if CONFIG_ARCH_INTERRUPTSTACK > 3 @@ -272,7 +272,7 @@ static void _up_assert(int errorcode) { /* Are we in an interrupt handler or the idle task? */ - if (current_regs || ((_TCB*)g_readytorun.head)->pid == 0) + if (current_regs || ((struct tcb_s*)g_readytorun.head)->pid == 0) { (void)irqsave(); for(;;) @@ -302,7 +302,7 @@ static void _up_assert(int errorcode) void up_assert(const uint8_t *filename, int lineno) { #ifdef CONFIG_PRINT_TASKNAME - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; #endif up_ledon(LED_ASSERTION); @@ -324,7 +324,7 @@ void up_assert(const uint8_t *filename, int lineno) void up_assert_code(const uint8_t *filename, int lineno, int errorcode) { #ifdef CONFIG_PRINT_TASKNAME - _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/arm/src/armv7-m/up_blocktask.c b/nuttx/arch/arm/src/armv7-m/up_blocktask.c index 896476ed2..15558ed4d 100644 --- a/nuttx/arch/arm/src/armv7-m/up_blocktask.c +++ b/nuttx/arch/arm/src/armv7-m/up_blocktask.c @@ -84,7 +84,7 @@ * ****************************************************************************/ -void up_block_task(_TCB *tcb, tstate_t task_state) +void up_block_task(struct tcb_s *tcb, tstate_t task_state) { /* Verify that the context switch can be performed */ @@ -95,7 +95,7 @@ void up_block_task(_TCB *tcb, tstate_t task_state) } else { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; bool switch_needed; /* Remove the tcb task from the ready-to-run list. If we @@ -138,7 +138,7 @@ void up_block_task(_TCB *tcb, tstate_t task_state) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; /* Then switch contexts */ @@ -153,7 +153,7 @@ void up_block_task(_TCB *tcb, tstate_t task_state) * ready to run list. */ - _TCB *nexttcb = (_TCB*)g_readytorun.head; + struct tcb_s *nexttcb = (struct tcb_s*)g_readytorun.head; up_switchcontext(rtcb->xcp.regs, nexttcb->xcp.regs); /* up_switchcontext forces a context switch to the task at the diff --git a/nuttx/arch/arm/src/armv7-m/up_initialstate.c b/nuttx/arch/arm/src/armv7-m/up_initialstate.c index 635a700fd..ee523a016 100644 --- a/nuttx/arch/arm/src/armv7-m/up_initialstate.c +++ b/nuttx/arch/arm/src/armv7-m/up_initialstate.c @@ -81,7 +81,7 @@ * ****************************************************************************/ -void up_initial_state(_TCB *tcb) +void up_initial_state(struct tcb_s *tcb) { struct xcptcontext *xcp = &tcb->xcp; diff --git a/nuttx/arch/arm/src/armv7-m/up_releasepending.c b/nuttx/arch/arm/src/armv7-m/up_releasepending.c index 2f0d4dc39..21c79bfc7 100644 --- a/nuttx/arch/arm/src/armv7-m/up_releasepending.c +++ b/nuttx/arch/arm/src/armv7-m/up_releasepending.c @@ -75,7 +75,7 @@ void up_release_pending(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; slldbg("From TCB=%p\n", rtcb); @@ -100,7 +100,7 @@ void up_release_pending(void) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then switch contexts */ @@ -116,7 +116,7 @@ void up_release_pending(void) * ready to run list. */ - _TCB *nexttcb = (_TCB*)g_readytorun.head; + struct tcb_s *nexttcb = (struct tcb_s*)g_readytorun.head; up_switchcontext(rtcb->xcp.regs, nexttcb->xcp.regs); /* up_switchcontext forces a context switch to the task at the diff --git a/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c b/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c index 9a971f064..94708a3be 100644 --- a/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c +++ b/nuttx/arch/arm/src/armv7-m/up_reprioritizertr.c @@ -84,7 +84,7 @@ * ****************************************************************************/ -void up_reprioritize_rtr(_TCB *tcb, uint8_t priority) +void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) { /* Verify that the caller is sane */ @@ -102,7 +102,7 @@ void up_reprioritize_rtr(_TCB *tcb, uint8_t priority) } else { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; bool switch_needed; slldbg("TCB=%p PRI=%d\n", tcb, priority); @@ -157,7 +157,7 @@ void up_reprioritize_rtr(_TCB *tcb, uint8_t priority) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; slldbg("New Active Task TCB=%p\n", rtcb); /* Then switch contexts */ @@ -173,7 +173,7 @@ void up_reprioritize_rtr(_TCB *tcb, uint8_t priority) * ready to run list. */ - _TCB *nexttcb = (_TCB*)g_readytorun.head; + struct tcb_s *nexttcb = (struct tcb_s*)g_readytorun.head; up_switchcontext(rtcb->xcp.regs, nexttcb->xcp.regs); /* up_switchcontext forces a context switch to the task at the diff --git a/nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c b/nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c index 9221a69a2..32f7082b3 100644 --- a/nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c +++ b/nuttx/arch/arm/src/armv7-m/up_schedulesigaction.c @@ -101,7 +101,7 @@ * ****************************************************************************/ -void up_schedule_sigaction(_TCB *tcb, sig_deliver_t sigdeliver) +void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) { /* Refuse to handle nested signal actions */ @@ -121,7 +121,7 @@ void up_schedule_sigaction(_TCB *tcb, sig_deliver_t sigdeliver) sdbg("rtcb=0x%p current_regs=0x%p\n", g_readytorun.head, current_regs); - if (tcb == (_TCB*)g_readytorun.head) + if (tcb == (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/arm/src/armv7-m/up_sigdeliver.c b/nuttx/arch/arm/src/armv7-m/up_sigdeliver.c index 654214b39..2e75d254a 100644 --- a/nuttx/arch/arm/src/armv7-m/up_sigdeliver.c +++ b/nuttx/arch/arm/src/armv7-m/up_sigdeliver.c @@ -81,7 +81,7 @@ void up_sigdeliver(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; uint32_t regs[XCPTCONTEXT_REGS]; sig_deliver_t sigdeliver; diff --git a/nuttx/arch/arm/src/armv7-m/up_svcall.c b/nuttx/arch/arm/src/armv7-m/up_svcall.c index d32f0afc2..9fa5a0b82 100644 --- a/nuttx/arch/arm/src/armv7-m/up_svcall.c +++ b/nuttx/arch/arm/src/armv7-m/up_svcall.c @@ -109,9 +109,9 @@ #ifdef CONFIG_NUTTX_KERNEL static inline void dispatch_syscall(uint32_t *regs) { - uint32_t cmd = regs[REG_R0]; - FAR _TCB *rtcb = sched_self(); - uintptr_t ret = (uintptr_t)ERROR; + uint32_t cmd = regs[REG_R0]; + FAR struct tcb_s *rtcb = sched_self(); + uintptr_t ret = (uintptr_t)ERROR; /* Verify the the SYS call number is within range */ diff --git a/nuttx/arch/arm/src/armv7-m/up_unblocktask.c b/nuttx/arch/arm/src/armv7-m/up_unblocktask.c index da10f0376..b2ff98879 100644 --- a/nuttx/arch/arm/src/armv7-m/up_unblocktask.c +++ b/nuttx/arch/arm/src/armv7-m/up_unblocktask.c @@ -79,7 +79,7 @@ * ****************************************************************************/ -void up_unblock_task(_TCB *tcb) +void up_unblock_task(struct tcb_s *tcb) { /* Verify that the context switch can be performed */ @@ -90,7 +90,7 @@ void up_unblock_task(_TCB *tcb) } else { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; /* Remove the task from the blocked task list */ @@ -128,7 +128,7 @@ void up_unblock_task(_TCB *tcb) * of the g_readytorun task list. */ - rtcb = (_TCB*)g_readytorun.head; + rtcb = (struct tcb_s*)g_readytorun.head; /* Then switch contexts */ @@ -143,7 +143,7 @@ void up_unblock_task(_TCB *tcb) * ready to run list. */ - _TCB *nexttcb = (_TCB*)g_readytorun.head; + struct tcb_s *nexttcb = (struct tcb_s*)g_readytorun.head; up_switchcontext(rtcb->xcp.regs, nexttcb->xcp.regs); /* up_switchcontext forces a context switch to the task at the diff --git a/nuttx/arch/arm/src/common/up_checkstack.c b/nuttx/arch/arm/src/common/up_checkstack.c index ac8d9e7b9..273d30d23 100644 --- a/nuttx/arch/arm/src/common/up_checkstack.c +++ b/nuttx/arch/arm/src/common/up_checkstack.c @@ -78,7 +78,7 @@ * ****************************************************************************/ -size_t up_check_tcbstack(FAR _TCB *tcb) +size_t up_check_tcbstack(FAR struct tcb_s *tcb) { FAR uint32_t *ptr; size_t mark; @@ -136,12 +136,12 @@ size_t up_check_tcbstack(FAR _TCB *tcb) size_t up_check_stack(void) { - return up_check_tcbstack((FAR _TCB*)g_readytorun.head); + return up_check_tcbstack((FAR struct tcb_s*)g_readytorun.head); } size_t up_check_stack_remain(void) { - return ((FAR _TCB*)g_readytorun.head)->adj_stack_size - up_check_tcbstack((FAR _TCB*)g_readytorun.head); + return ((FAR struct tcb_s*)g_readytorun.head)->adj_stack_size - up_check_tcbstack((FAR struct tcb_s*)g_readytorun.head); } #endif /* CONFIG_DEBUG && CONFIG_DEBUG_STACK */ diff --git a/nuttx/arch/arm/src/common/up_createstack.c b/nuttx/arch/arm/src/common/up_createstack.c index 3d6dfef45..e3f963227 100644 --- a/nuttx/arch/arm/src/common/up_createstack.c +++ b/nuttx/arch/arm/src/common/up_createstack.c @@ -128,7 +128,7 @@ static void *memset32(void *s, uint32_t c, size_t n) * 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) @@ -174,7 +174,7 @@ int up_create_stack(_TCB *tcb, size_t stack_size) 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/arm/src/common/up_exit.c b/nuttx/arch/arm/src/common/up_exit.c index 16f5c4442..76bf4e0dd 100644 --- a/nuttx/arch/arm/src/common/up_exit.c +++ b/nuttx/arch/arm/src/common/up_exit.c @@ -73,7 +73,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; @@ -136,7 +136,7 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg) void _exit(int status) { - _TCB* tcb; + struct tcb_s* tcb; /* Disable interrupts. They will be restored when the next * task is started. @@ -159,7 +159,7 @@ void _exit(int status) * head of the list. */ - tcb = (_TCB*)g_readytorun.head; + tcb = (struct tcb_s*)g_readytorun.head; /* Then switch contexts */ diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h index 8a24f003e..981fe7ae8 100644 --- a/nuttx/arch/arm/src/common/up_internal.h +++ b/nuttx/arch/arm/src/common/up_internal.h @@ -410,8 +410,8 @@ extern void up_rnginitialize(void); #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_STACK) extern size_t up_check_stack(void); -extern size_t up_check_tcbstack(FAR _TCB); -extern size_t up_check_tcbstack_remain(FAR _TCB); +extern size_t up_check_tcbstack(FAR struct tcb_s); +extern size_t up_check_tcbstack_remain(FAR struct tcb_s); #endif #endif /* __ASSEMBLY__ */ diff --git a/nuttx/arch/arm/src/common/up_releasestack.c b/nuttx/arch/arm/src/common/up_releasestack.c index 82f5db88f..cb0bf030a 100644 --- a/nuttx/arch/arm/src/common/up_releasestack.c +++ b/nuttx/arch/arm/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/arm/src/common/up_usestack.c b/nuttx/arch/arm/src/common/up_usestack.c index a3f4f4816..d94f99a57 100644 --- a/nuttx/arch/arm/src/common/up_usestack.c +++ b/nuttx/arch/arm/src/common/up_usestack.c @@ -109,7 +109,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; @@ -146,7 +146,7 @@ int up_use_stack(_TCB *tcb, void *stack, size_t stack_size) 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/arm/src/common/up_vfork.c b/nuttx/arch/arm/src/common/up_vfork.c index 3b653e317..f576f6bfd 100644 --- a/nuttx/arch/arm/src/common/up_vfork.c +++ b/nuttx/arch/arm/src/common/up_vfork.c @@ -126,8 +126,8 @@ pid_t up_vfork(const struct vfork_s *context) { - _TCB *parent = (FAR _TCB *)g_readytorun.head; - _TCB *child; + struct tcb_s *parent = (FAR struct tcb_s *)g_readytorun.head; + struct tcb_s *child; size_t stacksize; uint32_t newsp; uint32_t newfp; |