summaryrefslogtreecommitdiff
path: root/nuttx/arch/avr/src
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-10-27 01:46:08 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-10-27 01:46:08 +0000
commit665c4bf764eb07e58e70393c08671a2dfcd834bb (patch)
tree904da9f9c29f230c8a697e3174769241a8449bfc /nuttx/arch/avr/src
parent1acd573c5dd3cd1a32e18c93fc06a65dd1fa4a6d (diff)
downloadpx4-nuttx-665c4bf764eb07e58e70393c08671a2dfcd834bb.tar.gz
px4-nuttx-665c4bf764eb07e58e70393c08671a2dfcd834bb.tar.bz2
px4-nuttx-665c4bf764eb07e58e70393c08671a2dfcd834bb.zip
Fix a signal trampoline bugnuttx-5.12
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3053 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/avr/src')
-rw-r--r--nuttx/arch/avr/src/avr32/up_sigdeliver.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/nuttx/arch/avr/src/avr32/up_sigdeliver.c b/nuttx/arch/avr/src/avr32/up_sigdeliver.c
index 599b6f0d0..aa3940b79 100644
--- a/nuttx/arch/avr/src/avr32/up_sigdeliver.c
+++ b/nuttx/arch/avr/src/avr32/up_sigdeliver.c
@@ -103,9 +103,9 @@ void up_sigdeliver(void)
regs[REG_PC] = rtcb->xcp.saved_pc;
regs[REG_SR] = rtcb->xcp.saved_sr;
- /* Get a local copy of the sigdeliver function pointer. We do this so tha
- * we can nullify the sigdeliver function point in the TCB and accept more
- * signal deliveries while processing the current pending signals.
+ /* Get a local copy of the sigdeliver function pointer. We do this so that
+ * we can nullify the sigdeliver function pointer in the TCB and accept
+ * more signal deliveries while processing the current pending signals.
*/
sigdeliver = rtcb->xcp.sigdeliver;
@@ -119,17 +119,16 @@ void up_sigdeliver(void)
sigdeliver(rtcb);
- /* Output any debug messaged BEFORE restoring errno (becuase they may
- * alter errno), then restore the original errno that is needed by
- * the user logic (it is probably EINTR).
+ /* Output any debug messages BEFORE restoring errno (because they may
+ * alter errno), then disable interrupts again and restore the original
+ * errno that is needed by the user logic (it is probably EINTR).
*/
sdbg("Resuming\n");
+ (void)irqsave();
rtcb->pterrno = saved_errno;
- /* Then restore the correct state for this thread of
- * execution.
- */
+ /* Then restore the correct state for this thread of execution. */
up_ledoff(LED_SIGNAL);
up_fullcontextrestore(regs);