From 5bb4eb39f256f2cde4b9dbd6d0ab9a971e170382 Mon Sep 17 00:00:00 2001 From: Yoshinori Sugino Date: Mon, 28 Sep 2020 12:43:13 +0900 Subject: [PATCH] Fix nxstyle warnings --- arch/avr/src/avr32/up_schedulesigaction.c | 6 +++--- arch/misoc/src/lm32/lm32_schedulesigaction.c | 1 - .../src/minerva/minerva_schedulesigaction.c | 19 +++++++++++-------- arch/or1k/src/common/up_schedulesigaction.c | 19 ++++++++++++------- .../renesas/src/m16c/m16c_schedulesigaction.c | 10 +++++----- arch/renesas/src/sh1/sh1_schedulesigaction.c | 2 +- arch/z80/src/ez80/ez80_schedulesigaction.c | 4 +++- arch/z80/src/z180/z180_schedulesigaction.c | 11 +++++++---- arch/z80/src/z8/z8_schedulesigaction.c | 15 ++++++++++----- arch/z80/src/z80/z80_schedulesigaction.c | 11 +++++++---- 10 files changed, 59 insertions(+), 39 deletions(-) diff --git a/arch/avr/src/avr32/up_schedulesigaction.c b/arch/avr/src/avr32/up_schedulesigaction.c index 7b51d8e7ab..3857191b41 100644 --- a/arch/avr/src/avr32/up_schedulesigaction.c +++ b/arch/avr/src/avr32/up_schedulesigaction.c @@ -136,9 +136,9 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) else { - /* Save registers that must be protected while the signal handler - * runs. These will be restored by the signal trampoline after - * the signal(s) have been delivered. + /* Save registers that must be protected while the signal + * handler runs. These will be restored by the signal + * trampoline after the signal(s) have been delivered. */ tcb->xcp.sigdeliver = sigdeliver; diff --git a/arch/misoc/src/lm32/lm32_schedulesigaction.c b/arch/misoc/src/lm32/lm32_schedulesigaction.c index ea37986d72..97effb3d5b 100644 --- a/arch/misoc/src/lm32/lm32_schedulesigaction.c +++ b/arch/misoc/src/lm32/lm32_schedulesigaction.c @@ -155,7 +155,6 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) g_current_regs[REG_EPC] = (uint32_t)lm32_sigdeliver; g_current_regs[REG_INT_CTX] = 0; - /* And make sure that the saved context in the TCB * is the same as the interrupt return context. */ diff --git a/arch/misoc/src/minerva/minerva_schedulesigaction.c b/arch/misoc/src/minerva/minerva_schedulesigaction.c index 40c34ecf54..3f10ad3f77 100644 --- a/arch/misoc/src/minerva/minerva_schedulesigaction.c +++ b/arch/misoc/src/minerva/minerva_schedulesigaction.c @@ -133,16 +133,16 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * * Hmmm... there looks like a latent bug here: The following logic * would fail in the strange case where we are in an interrupt - * handler, the thread is signalling itself, but a context switch to - * another task has occurred so that g_current_regs does not refer - * to the thread of this_task()! + * handler, the thread is signalling itself, but a context switch + * to another task has occurred so that g_current_regs does not + * refer to the thread of this_task()! */ else { /* Save the return EPC and STATUS registers. These will be - * restored by the signal trampoline after the signals have been - * delivered. + * restored by the signal trampoline after the signals have + * been delivered. */ tcb->xcp.sigdeliver = sigdeliver; @@ -175,15 +175,18 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) else { - /* Save the return EPC and STATUS registers. These will be restored - * by the signal trampoline after the signals have been delivered. + /* Save the return EPC and STATUS registers. These will be + * restored by the signal trampoline after the signals have been + * delivered. */ tcb->xcp.sigdeliver = sigdeliver; tcb->xcp.saved_epc = tcb->xcp.regs[REG_CSR_MEPC]; tcb->xcp.saved_int_ctx = tcb->xcp.regs[REG_CSR_MSTATUS]; - /* Then set up to vector to the trampoline with interrupts disabled */ + /* Then set up to vector to the trampoline with interrupts + * disabled + */ tcb->xcp.regs[REG_CSR_MEPC] = (uint32_t) minerva_sigdeliver; g_current_regs[REG_CSR_MSTATUS] &= ~CSR_MSTATUS_MIE; diff --git a/arch/or1k/src/common/up_schedulesigaction.c b/arch/or1k/src/common/up_schedulesigaction.c index 51b0d2e647..b6ef2207ee 100644 --- a/arch/or1k/src/common/up_schedulesigaction.c +++ b/arch/or1k/src/common/up_schedulesigaction.c @@ -140,15 +140,18 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) */ tcb->xcp.sigdeliver = sigdeliver; - //tcb->xcp.saved_pc = CURRENT_REGS[REG_PC]; - //tcb->xcp.saved_cpsr = CURRENT_REGS[REG_CPSR]; + /* tcb->xcp.saved_pc = CURRENT_REGS[REG_PC]; + * tcb->xcp.saved_cpsr = CURRENT_REGS[REG_CPSR]; + */ /* Then set up to vector to the trampoline with interrupts * disabled */ - //CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; - //CURRENT_REGS[REG_CPSR] = SVC_MODE | PSR_I_BIT | PSR_F_BIT; + /* CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + * CURRENT_REGS[REG_CPSR] = SVC_MODE | PSR_I_BIT | + * PSR_F_BIT; + */ /* And make sure that the saved context in the TCB * is the same as the interrupt return context. @@ -173,14 +176,16 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) tcb->xcp.sigdeliver = sigdeliver; tcb->xcp.saved_pc = tcb->xcp.regs[REG_PC]; - //tcb->xcp.saved_cpsr = tcb->xcp.regs[REG_CPSR]; + + /* tcb->xcp.saved_cpsr = tcb->xcp.regs[REG_CPSR]; */ /* Then set up to vector to the trampoline with interrupts * disabled */ - //tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; - //tcb->xcp.regs[REG_CPSR] = SVC_MODE | PSR_I_BIT | PSR_F_BIT; + /* tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + * tcb->xcp.regs[REG_CPSR] = SVC_MODE | PSR_I_BIT | PSR_F_BIT; + */ } } diff --git a/arch/renesas/src/m16c/m16c_schedulesigaction.c b/arch/renesas/src/m16c/m16c_schedulesigaction.c index e49e558343..d0ce7e15bf 100644 --- a/arch/renesas/src/m16c/m16c_schedulesigaction.c +++ b/arch/renesas/src/m16c/m16c_schedulesigaction.c @@ -51,7 +51,7 @@ #include "up_arch.h" /**************************************************************************** - * Public Funictions + * Public Functions ****************************************************************************/ /**************************************************************************** @@ -135,7 +135,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) tcb->xcp.sigdeliver = sigdeliver; tcb->xcp.saved_pc[0] = g_current_regs[REG_PC]; - tcb->xcp.saved_pc[1] = g_current_regs[REG_PC+1]; + tcb->xcp.saved_pc[1] = g_current_regs[REG_PC + 1]; tcb->xcp.saved_flg = g_current_regs[REG_FLG]; /* Then set up to vector to the trampoline with interrupts @@ -143,7 +143,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) */ g_current_regs[REG_PC] = (uint32_t)up_sigdeliver >> 8; - g_current_regs[REG_PC+1] = (uint32_t)up_sigdeliver; + g_current_regs[REG_PC + 1] = (uint32_t)up_sigdeliver; g_current_regs[REG_FLG] &= ~M16C_FLG_I; /* And make sure that the saved context in the TCB @@ -169,7 +169,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) tcb->xcp.sigdeliver = sigdeliver; tcb->xcp.saved_pc[0] = tcb->xcp.regs[REG_PC]; - tcb->xcp.saved_pc[1] = tcb->xcp.regs[REG_PC+1]; + tcb->xcp.saved_pc[1] = tcb->xcp.regs[REG_PC + 1]; tcb->xcp.saved_flg = tcb->xcp.regs[REG_FLG]; /* Then set up to vector to the trampoline with interrupts @@ -177,7 +177,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) */ tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver >> 8; - tcb->xcp.regs[REG_PC+1] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC + 1] = (uint32_t)up_sigdeliver; tcb->xcp.regs[REG_FLG] &= ~M16C_FLG_I; } } diff --git a/arch/renesas/src/sh1/sh1_schedulesigaction.c b/arch/renesas/src/sh1/sh1_schedulesigaction.c index 338753bf53..54521a1efc 100644 --- a/arch/renesas/src/sh1/sh1_schedulesigaction.c +++ b/arch/renesas/src/sh1/sh1_schedulesigaction.c @@ -51,7 +51,7 @@ #include "up_arch.h" /**************************************************************************** - * Public Funictions + * Public Functions ****************************************************************************/ /**************************************************************************** diff --git a/arch/z80/src/ez80/ez80_schedulesigaction.c b/arch/z80/src/ez80/ez80_schedulesigaction.c index 627aaefd6b..b18abb732f 100644 --- a/arch/z80/src/ez80/ez80_schedulesigaction.c +++ b/arch/z80/src/ez80/ez80_schedulesigaction.c @@ -136,7 +136,9 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) else { - /* Set up to vector to the trampoline with interrupts disabled. */ + /* Set up to vector to the trampoline with interrupts + * disabled. + */ ez80_sigsetup(tcb, sigdeliver, IRQ_STATE()); diff --git a/arch/z80/src/z180/z180_schedulesigaction.c b/arch/z80/src/z180/z180_schedulesigaction.c index fc36adb428..8d185712d8 100644 --- a/arch/z80/src/z180/z180_schedulesigaction.c +++ b/arch/z80/src/z180/z180_schedulesigaction.c @@ -154,7 +154,9 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) else { - /* Set up to vector to the trampoline with interrupts disabled. */ + /* Set up to vector to the trampoline with interrupts + * disabled. + */ z180_sigsetup(tcb, sigdeliver, IRQ_STATE()); @@ -166,9 +168,10 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) } } - /* Otherwise, we are (1) signaling a task is not running from an interrupt - * handler or (2) we are not in an interrupt handler and the running task - * is signalling some non-running task. + /* Otherwise, we are (1) signaling a task is not running + * from an interrupt handler or (2) we are not in an + * interrupt handler and the running task is signalling + * some non-running task. */ else diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c index 5133116d96..5825b8537d 100644 --- a/arch/z80/src/z8/z8_schedulesigaction.c +++ b/arch/z80/src/z8/z8_schedulesigaction.c @@ -151,7 +151,9 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) else { - /* Set up to vector to the trampoline with interrupts disabled. */ + /* Set up to vector to the trampoline with interrupts + * disabled. + */ z8_sigsetup(tcb, sigdeliver, IRQ_STATE()); @@ -163,14 +165,17 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) } } - /* Otherwise, we are (1) signaling a task is not running from an interrupt - * handler or (2) we are not in an interrupt handler and the running task - * is signalling some non-running task. + /* Otherwise, we are (1) signaling a task is not running + * from an interrupt handler or (2) we are not in an + * interrupt handler and the running task is signalling + * some non-running task. */ else { - /* Set up to vector to the trampoline with interrupts disabled. */ + /* Set up to vector to the trampoline with interrupts + * disabled. + */ z8_sigsetup(tcb, sigdeliver, tcb->xcp.regs); } diff --git a/arch/z80/src/z80/z80_schedulesigaction.c b/arch/z80/src/z80/z80_schedulesigaction.c index 7be9889d35..657ef6fb3e 100644 --- a/arch/z80/src/z80/z80_schedulesigaction.c +++ b/arch/z80/src/z80/z80_schedulesigaction.c @@ -152,7 +152,9 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) else { - /* Set up to vector to the trampoline with interrupts disabled. */ + /* Set up to vector to the trampoline with interrupts + * disabled. + */ z80_sigsetup(tcb, sigdeliver, IRQ_STATE()); @@ -164,9 +166,10 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver) } } - /* Otherwise, we are (1) signaling a task is not running from an interrupt - * handler or (2) we are not in an interrupt handler and the running task - * is signalling some non-running task. + /* Otherwise, we are (1) signaling a task is not running + * from an interrupt handler or (2) we are not in an + * interrupt handler and the running task is signalling + * some non-running task. */ else