You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/09/28 05:54:51 UTC
[incubator-nuttx] branch master updated (fe0a88c -> 5bb4eb3)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from fe0a88c Correct compilation of arch/sim/src/sim/up_wpcap.c
new 698008d Fix typos
new 5bb4eb3 Fix nxstyle warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/arm/arm_schedulesigaction.c | 2 +-
arch/arm/src/armv6-m/arm_schedulesigaction.c | 2 +-
arch/avr/src/avr/up_schedulesigaction.c | 2 +-
arch/avr/src/avr32/up_schedulesigaction.c | 8 ++++----
arch/misoc/src/lm32/lm32_schedulesigaction.c | 3 +--
arch/misoc/src/minerva/minerva_schedulesigaction.c | 21 ++++++++++++---------
arch/or1k/src/common/up_schedulesigaction.c | 21 +++++++++++++--------
arch/renesas/src/m16c/m16c_schedulesigaction.c | 12 ++++++------
arch/renesas/src/rx65n/rx65n_schedulesigaction.c | 2 +-
arch/renesas/src/sh1/sh1_schedulesigaction.c | 4 ++--
arch/risc-v/src/fe310/fe310_schedulesigaction.c | 2 +-
arch/risc-v/src/k210/k210_schedulesigaction.c | 2 +-
arch/risc-v/src/litex/litex_schedulesigaction.c | 2 +-
arch/risc-v/src/nr5m100/nr5_schedulesigaction.c | 2 +-
arch/risc-v/src/rv32im/riscv_schedulesigaction.c | 2 +-
arch/sim/src/sim/up_schedulesigaction.c | 2 +-
arch/z16/src/common/z16_schedulesigaction.c | 2 +-
arch/z80/src/ez80/ez80_schedulesigaction.c | 6 ++++--
arch/z80/src/z180/z180_schedulesigaction.c | 13 ++++++++-----
arch/z80/src/z8/z8_schedulesigaction.c | 17 +++++++++++------
arch/z80/src/z80/z80_schedulesigaction.c | 13 ++++++++-----
include/nuttx/arch.h | 2 +-
22 files changed, 81 insertions(+), 61 deletions(-)
[incubator-nuttx] 01/02: Fix typos
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 698008d1e514c47e5484de3ae1c1e385a605d225
Author: Yoshinori Sugino <ys...@gmail.com>
AuthorDate: Mon Sep 28 10:18:26 2020 +0900
Fix typos
---
arch/arm/src/arm/arm_schedulesigaction.c | 2 +-
arch/arm/src/armv6-m/arm_schedulesigaction.c | 2 +-
arch/avr/src/avr/up_schedulesigaction.c | 2 +-
arch/avr/src/avr32/up_schedulesigaction.c | 2 +-
arch/misoc/src/lm32/lm32_schedulesigaction.c | 2 +-
arch/misoc/src/minerva/minerva_schedulesigaction.c | 2 +-
arch/or1k/src/common/up_schedulesigaction.c | 2 +-
arch/renesas/src/m16c/m16c_schedulesigaction.c | 2 +-
arch/renesas/src/rx65n/rx65n_schedulesigaction.c | 2 +-
arch/renesas/src/sh1/sh1_schedulesigaction.c | 2 +-
arch/risc-v/src/fe310/fe310_schedulesigaction.c | 2 +-
arch/risc-v/src/k210/k210_schedulesigaction.c | 2 +-
arch/risc-v/src/litex/litex_schedulesigaction.c | 2 +-
arch/risc-v/src/nr5m100/nr5_schedulesigaction.c | 2 +-
arch/risc-v/src/rv32im/riscv_schedulesigaction.c | 2 +-
arch/sim/src/sim/up_schedulesigaction.c | 2 +-
arch/z16/src/common/z16_schedulesigaction.c | 2 +-
arch/z80/src/ez80/ez80_schedulesigaction.c | 2 +-
arch/z80/src/z180/z180_schedulesigaction.c | 2 +-
arch/z80/src/z8/z8_schedulesigaction.c | 2 +-
arch/z80/src/z80/z80_schedulesigaction.c | 2 +-
include/nuttx/arch.h | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/arm/src/arm/arm_schedulesigaction.c b/arch/arm/src/arm/arm_schedulesigaction.c
index a56d89d..d1f40ff 100644
--- a/arch/arm/src/arm/arm_schedulesigaction.c
+++ b/arch/arm/src/arm/arm_schedulesigaction.c
@@ -62,7 +62,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/arm/src/armv6-m/arm_schedulesigaction.c b/arch/arm/src/armv6-m/arm_schedulesigaction.c
index 8603f7a..dfe8e11 100644
--- a/arch/arm/src/armv6-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv6-m/arm_schedulesigaction.c
@@ -63,7 +63,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/avr/src/avr/up_schedulesigaction.c b/arch/avr/src/avr/up_schedulesigaction.c
index f0d4f45..8bb45ad 100644
--- a/arch/avr/src/avr/up_schedulesigaction.c
+++ b/arch/avr/src/avr/up_schedulesigaction.c
@@ -62,7 +62,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/avr/src/avr32/up_schedulesigaction.c b/arch/avr/src/avr32/up_schedulesigaction.c
index 15ffc01..7b51d8e 100644
--- a/arch/avr/src/avr32/up_schedulesigaction.c
+++ b/arch/avr/src/avr32/up_schedulesigaction.c
@@ -62,7 +62,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/misoc/src/lm32/lm32_schedulesigaction.c b/arch/misoc/src/lm32/lm32_schedulesigaction.c
index 03470f2..ea37986 100644
--- a/arch/misoc/src/lm32/lm32_schedulesigaction.c
+++ b/arch/misoc/src/lm32/lm32_schedulesigaction.c
@@ -66,7 +66,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/misoc/src/minerva/minerva_schedulesigaction.c b/arch/misoc/src/minerva/minerva_schedulesigaction.c
index f9a7cfc..40c34ec 100644
--- a/arch/misoc/src/minerva/minerva_schedulesigaction.c
+++ b/arch/misoc/src/minerva/minerva_schedulesigaction.c
@@ -67,7 +67,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/or1k/src/common/up_schedulesigaction.c b/arch/or1k/src/common/up_schedulesigaction.c
index 10278e8..51b0d2e 100644
--- a/arch/or1k/src/common/up_schedulesigaction.c
+++ b/arch/or1k/src/common/up_schedulesigaction.c
@@ -61,7 +61,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/renesas/src/m16c/m16c_schedulesigaction.c b/arch/renesas/src/m16c/m16c_schedulesigaction.c
index eab47c6..e49e558 100644
--- a/arch/renesas/src/m16c/m16c_schedulesigaction.c
+++ b/arch/renesas/src/m16c/m16c_schedulesigaction.c
@@ -61,7 +61,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/renesas/src/rx65n/rx65n_schedulesigaction.c b/arch/renesas/src/rx65n/rx65n_schedulesigaction.c
index 63931fd..71da576 100644
--- a/arch/renesas/src/rx65n/rx65n_schedulesigaction.c
+++ b/arch/renesas/src/rx65n/rx65n_schedulesigaction.c
@@ -46,7 +46,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/renesas/src/sh1/sh1_schedulesigaction.c b/arch/renesas/src/sh1/sh1_schedulesigaction.c
index 4f2b4c0..338753b 100644
--- a/arch/renesas/src/sh1/sh1_schedulesigaction.c
+++ b/arch/renesas/src/sh1/sh1_schedulesigaction.c
@@ -61,7 +61,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/risc-v/src/fe310/fe310_schedulesigaction.c b/arch/risc-v/src/fe310/fe310_schedulesigaction.c
index 4beed8d..9033870 100644
--- a/arch/risc-v/src/fe310/fe310_schedulesigaction.c
+++ b/arch/risc-v/src/fe310/fe310_schedulesigaction.c
@@ -64,7 +64,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/risc-v/src/k210/k210_schedulesigaction.c b/arch/risc-v/src/k210/k210_schedulesigaction.c
index 1f2e7cd..f17b842 100644
--- a/arch/risc-v/src/k210/k210_schedulesigaction.c
+++ b/arch/risc-v/src/k210/k210_schedulesigaction.c
@@ -66,7 +66,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/risc-v/src/litex/litex_schedulesigaction.c b/arch/risc-v/src/litex/litex_schedulesigaction.c
index 77c5c2b..3a7d7e3 100644
--- a/arch/risc-v/src/litex/litex_schedulesigaction.c
+++ b/arch/risc-v/src/litex/litex_schedulesigaction.c
@@ -47,7 +47,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/risc-v/src/nr5m100/nr5_schedulesigaction.c b/arch/risc-v/src/nr5m100/nr5_schedulesigaction.c
index 375f7f1..8c1af39 100644
--- a/arch/risc-v/src/nr5m100/nr5_schedulesigaction.c
+++ b/arch/risc-v/src/nr5m100/nr5_schedulesigaction.c
@@ -67,7 +67,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/risc-v/src/rv32im/riscv_schedulesigaction.c b/arch/risc-v/src/rv32im/riscv_schedulesigaction.c
index 00aef90..3fce095 100644
--- a/arch/risc-v/src/rv32im/riscv_schedulesigaction.c
+++ b/arch/risc-v/src/rv32im/riscv_schedulesigaction.c
@@ -48,7 +48,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/sim/src/sim/up_schedulesigaction.c b/arch/sim/src/sim/up_schedulesigaction.c
index b875b91..f624e1b 100644
--- a/arch/sim/src/sim/up_schedulesigaction.c
+++ b/arch/sim/src/sim/up_schedulesigaction.c
@@ -58,7 +58,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/z16/src/common/z16_schedulesigaction.c b/arch/z16/src/common/z16_schedulesigaction.c
index c91cdd1..64120cf 100644
--- a/arch/z16/src/common/z16_schedulesigaction.c
+++ b/arch/z16/src/common/z16_schedulesigaction.c
@@ -45,7 +45,7 @@
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/z80/src/ez80/ez80_schedulesigaction.c b/arch/z80/src/ez80/ez80_schedulesigaction.c
index 64c3e3f..627aaef 100644
--- a/arch/z80/src/ez80/ez80_schedulesigaction.c
+++ b/arch/z80/src/ez80/ez80_schedulesigaction.c
@@ -71,7 +71,7 @@ static void ez80_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver,
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/z80/src/z180/z180_schedulesigaction.c b/arch/z80/src/z180/z180_schedulesigaction.c
index 18009b0..fc36adb 100644
--- a/arch/z80/src/z180/z180_schedulesigaction.c
+++ b/arch/z80/src/z180/z180_schedulesigaction.c
@@ -89,7 +89,7 @@ static void z180_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver,
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c
index f8c6ccc..5133116 100644
--- a/arch/z80/src/z8/z8_schedulesigaction.c
+++ b/arch/z80/src/z8/z8_schedulesigaction.c
@@ -86,7 +86,7 @@ static void z8_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver,
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/arch/z80/src/z80/z80_schedulesigaction.c b/arch/z80/src/z80/z80_schedulesigaction.c
index 2cef6e9..7be9889 100644
--- a/arch/z80/src/z80/z80_schedulesigaction.c
+++ b/arch/z80/src/z80/z80_schedulesigaction.c
@@ -87,7 +87,7 @@ static void z80_sigsetup(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver,
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h
index e28a217..31cd3b0 100644
--- a/include/nuttx/arch.h
+++ b/include/nuttx/arch.h
@@ -484,7 +484,7 @@ void up_assert(FAR const char *filename, int linenum);
* This function is called by the OS when one or more
* signal handling actions have been queued for execution.
* The architecture specific code must configure things so
- * that the 'igdeliver' callback is executed on the thread
+ * that the 'sigdeliver' callback is executed on the thread
* specified by 'tcb' as soon as possible.
*
* This function may be called from interrupt handling logic.
[incubator-nuttx] 02/02: Fix nxstyle warnings
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 5bb4eb39f256f2cde4b9dbd6d0ab9a971e170382
Author: Yoshinori Sugino <ys...@gmail.com>
AuthorDate: Mon Sep 28 12:43:13 2020 +0900
Fix nxstyle warnings
---
arch/avr/src/avr32/up_schedulesigaction.c | 6 +++---
arch/misoc/src/lm32/lm32_schedulesigaction.c | 1 -
arch/misoc/src/minerva/minerva_schedulesigaction.c | 19 +++++++++++--------
arch/or1k/src/common/up_schedulesigaction.c | 19 ++++++++++++-------
arch/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 7b51d8e..3857191 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 ea37986..97effb3 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 40c34ec..3f10ad3 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 51b0d2e..b6ef220 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 e49e558..d0ce7e1 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 338753b..54521a1 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 627aaef..b18abb7 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 fc36adb..8d18571 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 5133116..5825b85 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 7be9889..657ef6f 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