summaryrefslogtreecommitdiff
path: root/nuttx/arch/mips/src/pic32mx/pic32mx-head.S
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-11-18 22:37:27 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-11-18 22:37:27 +0000
commit4c9dba435f3e93077bd3c9d68894f025db83e1cb (patch)
tree2c82194f36f24ffcc743eff72603bdaee78e7735 /nuttx/arch/mips/src/pic32mx/pic32mx-head.S
parent133a0934d05d6ffa700582e77c756ffdb188c825 (diff)
downloadnuttx-4c9dba435f3e93077bd3c9d68894f025db83e1cb.tar.gz
nuttx-4c9dba435f3e93077bd3c9d68894f025db83e1cb.tar.bz2
nuttx-4c9dba435f3e93077bd3c9d68894f025db83e1cb.zip
More PIC32 fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4101 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/mips/src/pic32mx/pic32mx-head.S')
-rw-r--r--nuttx/arch/mips/src/pic32mx/pic32mx-head.S12
1 files changed, 9 insertions, 3 deletions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S
index 8857aee34..2491cf451 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S
@@ -436,7 +436,9 @@ _bev_handler:
la t0, pic32mx_dobev /* Call up_dobev(regs) */
jalr ra, t0
nop
- di /* Disable interrupts */
+#ifdef CONFIG_PIC32MX_NESTED_INTERRUPTS
+ di /* Prohibit nested interrupts from here */
+#endif
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by up_dobev() */
.end _bev_handler
@@ -459,7 +461,9 @@ _int_handler:
la t0, pic32mx_decodeirq /* Call pic32mx_decodeirq(regs) */
jalr ra, t0
nop
- di /* Disable interrupts */
+#ifdef CONFIG_PIC32MX_NESTED_INTERRUPTS
+ di /* Prohibit nested interrupts from here */
+#endif
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_decodeirq() */
.end _int_handler
@@ -483,7 +487,9 @@ _nmi_handler:
la t0, pic32mx_donmi /* Call up_donmi(regs) */
jalr ra, t0
nop
- di /* Disable interrupts */
+#ifdef CONFIG_PIC32MX_NESTED_INTERRUPTS
+ di /* Prohibit nested interrupts from here */
+#endif
RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */
EXCPT_EPILOGUE v0 /* Return to the context returned by pic32mx_donmi() */
.end _nmi_handler