diff options
Diffstat (limited to 'nuttx/arch/sh/src')
-rw-r--r-- | nuttx/arch/sh/src/common/up_assert.c | 6 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_blocktask.c | 8 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_createstack.c | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_exit.c | 6 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_releasepending.c | 6 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_releasestack.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_reprioritizertr.c | 8 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_unblocktask.c | 8 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_usestack.c | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_dumpstate.c | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_initialstate.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/m16c/m16c_sigdeliver.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_dumpstate.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_initialstate.c | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/src/sh1/sh1_sigdeliver.c | 2 |
17 files changed, 37 insertions, 37 deletions
diff --git a/nuttx/arch/sh/src/common/up_assert.c b/nuttx/arch/sh/src/common/up_assert.c index 62889fa5a..72880fd2a 100644 --- a/nuttx/arch/sh/src/common/up_assert.c +++ b/nuttx/arch/sh/src/common/up_assert.c @@ -81,7 +81,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(;;) @@ -111,7 +111,7 @@ static void _up_assert(int errorcode) void up_assert(const uint8_t *filename, int lineno) { #if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG) - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; #endif up_ledon(LED_ASSERTION); @@ -133,7 +133,7 @@ void up_assert(const uint8_t *filename, int lineno) void up_assert_code(const uint8_t *filename, int lineno, int errorcode) { #if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG) - _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/sh/src/common/up_blocktask.c b/nuttx/arch/sh/src/common/up_blocktask.c index 0a53b6633..db7f0297c 100644 --- a/nuttx/arch/sh/src/common/up_blocktask.c +++ b/nuttx/arch/sh/src/common/up_blocktask.c @@ -83,7 +83,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 */ @@ -94,7 +94,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 @@ -137,7 +137,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 */ @@ -155,7 +155,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/sh/src/common/up_createstack.c b/nuttx/arch/sh/src/common/up_createstack.c index f80e4f7c0..f868750de 100644 --- a/nuttx/arch/sh/src/common/up_createstack.c +++ b/nuttx/arch/sh/src/common/up_createstack.c @@ -83,7 +83,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) @@ -119,7 +119,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/sh/src/common/up_exit.c b/nuttx/arch/sh/src/common/up_exit.c index 705f49852..31c8e0404 100644 --- a/nuttx/arch/sh/src/common/up_exit.c +++ b/nuttx/arch/sh/src/common/up_exit.c @@ -74,7 +74,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; @@ -137,7 +137,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. @@ -160,7 +160,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/sh/src/common/up_releasepending.c b/nuttx/arch/sh/src/common/up_releasepending.c index 955febea1..b3960972d 100644 --- a/nuttx/arch/sh/src/common/up_releasepending.c +++ b/nuttx/arch/sh/src/common/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/sh/src/common/up_releasestack.c b/nuttx/arch/sh/src/common/up_releasestack.c index bb6739433..3b4e4c914 100644 --- a/nuttx/arch/sh/src/common/up_releasestack.c +++ b/nuttx/arch/sh/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/sh/src/common/up_reprioritizertr.c b/nuttx/arch/sh/src/common/up_reprioritizertr.c index 99d350b29..dcf0fcd7b 100644 --- a/nuttx/arch/sh/src/common/up_reprioritizertr.c +++ b/nuttx/arch/sh/src/common/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/sh/src/common/up_unblocktask.c b/nuttx/arch/sh/src/common/up_unblocktask.c index 5841f50ad..b7c88f823 100644 --- a/nuttx/arch/sh/src/common/up_unblocktask.c +++ b/nuttx/arch/sh/src/common/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/sh/src/common/up_usestack.c b/nuttx/arch/sh/src/common/up_usestack.c index 41367ce0b..ee26cb70c 100644 --- a/nuttx/arch/sh/src/common/up_usestack.c +++ b/nuttx/arch/sh/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; diff --git a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c index 38571a7e1..3570a9ebe 100644 --- a/nuttx/arch/sh/src/m16c/m16c_dumpstate.c +++ b/nuttx/arch/sh/src/m16c/m16c_dumpstate.c @@ -158,8 +158,8 @@ static inline void m16c_registerdump(void) void up_dumpstate(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; - uint16_t sp = m16c_getsp(); + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; + uint16_t sp = m16c_getsp(); uint16_t ustackbase; uint16_t ustacksize; #if CONFIG_ARCH_INTERRUPTSTACK > 3 diff --git a/nuttx/arch/sh/src/m16c/m16c_initialstate.c b/nuttx/arch/sh/src/m16c/m16c_initialstate.c index f667cf557..ee22d5497 100644 --- a/nuttx/arch/sh/src/m16c/m16c_initialstate.c +++ b/nuttx/arch/sh/src/m16c/m16c_initialstate.c @@ -77,7 +77,7 @@ * ****************************************************************************/ -void up_initial_state(FAR _TCB *tcb) +void up_initial_state(FAR struct tcb_s *tcb) { FAR struct xcptcontext *xcp = &tcb->xcp; FAR uint8_t *regs = xcp->regs; diff --git a/nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c b/nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c index 0dc33568d..d7af7e477 100644 --- a/nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c +++ b/nuttx/arch/sh/src/m16c/m16c_schedulesigaction.c @@ -100,7 +100,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 */ @@ -120,7 +120,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/sh/src/m16c/m16c_sigdeliver.c b/nuttx/arch/sh/src/m16c/m16c_sigdeliver.c index 958ff56af..7bba3b902 100644 --- a/nuttx/arch/sh/src/m16c/m16c_sigdeliver.c +++ b/nuttx/arch/sh/src/m16c/m16c_sigdeliver.c @@ -81,7 +81,7 @@ void up_sigdeliver(void) { #ifndef CONFIG_DISABLE_SIGNALS - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; uint8_t regs[XCPTCONTEXT_SIZE]; sig_deliver_t sigdeliver; diff --git a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c index f54ea46ce..3d101c92d 100644 --- a/nuttx/arch/sh/src/sh1/sh1_dumpstate.c +++ b/nuttx/arch/sh/src/sh1/sh1_dumpstate.c @@ -147,7 +147,7 @@ static inline void sh1_registerdump(void) void up_dumpstate(void) { - _TCB *rtcb = (_TCB*)g_readytorun.head; + struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head; uint32_t sp = sh1_getsp(); uint32_t ustackbase; uint32_t ustacksize; diff --git a/nuttx/arch/sh/src/sh1/sh1_initialstate.c b/nuttx/arch/sh/src/sh1/sh1_initialstate.c index c4fb11a74..fe703f5a9 100644 --- a/nuttx/arch/sh/src/sh1/sh1_initialstate.c +++ b/nuttx/arch/sh/src/sh1/sh1_initialstate.c @@ -92,7 +92,7 @@ static inline irqstate_t up_getsr(void) * ****************************************************************************/ -void up_initial_state(_TCB *tcb) +void up_initial_state(struct tcb_s *tcb) { struct xcptcontext *xcp = &tcb->xcp; diff --git a/nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c b/nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c index f0bc0af84..1c05d669c 100644 --- a/nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c +++ b/nuttx/arch/sh/src/sh1/sh1_schedulesigaction.c @@ -100,7 +100,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 */ @@ -120,7 +120,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/sh/src/sh1/sh1_sigdeliver.c b/nuttx/arch/sh/src/sh1/sh1_sigdeliver.c index 2f596b6b0..eb278163d 100644 --- a/nuttx/arch/sh/src/sh1/sh1_sigdeliver.c +++ b/nuttx/arch/sh/src/sh1/sh1_sigdeliver.c @@ -81,7 +81,7 @@ void up_sigdeliver(void) { #ifndef CONFIG_DISABLE_SIGNALS - _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; |