aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/osal
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-11-15 09:36:57 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-11-15 09:36:57 +0000
commit19cfe3b26f31a350974816afc487ad0bdf1cdefe (patch)
tree74297dc4985decb43252d5a0d8a5ebbb6d58843f /os/hal/osal
parent4464b4a0d563ee49842ca11704aaf83e2f0ab991 (diff)
downloadChibiOS-19cfe3b26f31a350974816afc487ad0bdf1cdefe.tar.gz
ChibiOS-19cfe3b26f31a350974816afc487ad0bdf1cdefe.tar.bz2
ChibiOS-19cfe3b26f31a350974816afc487ad0bdf1cdefe.zip
Fixed bug #987.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12425 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/hal/osal')
-rw-r--r--os/hal/osal/os-less/ARMCMx/osal.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/os/hal/osal/os-less/ARMCMx/osal.h b/os/hal/osal/os-less/ARMCMx/osal.h
index 248af8831..14ba6b115 100644
--- a/os/hal/osal/os-less/ARMCMx/osal.h
+++ b/os/hal/osal/os-less/ARMCMx/osal.h
@@ -598,6 +598,11 @@ static inline void osalSysLockFromISR(void) {
*/
static inline void osalSysUnlockFromISR(void) {
+#if CORTEX_MODEL == 0
+ __enable_irq();
+#else
+ __set_BASEPRI(0);
+#endif
}
/**