diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-11-29 09:56:02 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-11-29 09:56:02 +0000 |
| commit | 56efe5ddcacc0a2707ba5dc891d2591044e3494f (patch) | |
| tree | 7ad34c5edfc5a51ca1ef886d943454f7b866012a /os/nil | |
| parent | 5404d1ee8da67275b467d0ec4ce4ca9da8b98f27 (diff) | |
| download | ChibiOS-56efe5ddcacc0a2707ba5dc891d2591044e3494f.tar.gz ChibiOS-56efe5ddcacc0a2707ba5dc891d2591044e3494f.tar.bz2 ChibiOS-56efe5ddcacc0a2707ba5dc891d2591044e3494f.zip | |
Fixed bug #675.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8549 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/nil')
| -rw-r--r-- | os/nil/ports/ARMCMx/nilcore_v7m.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/os/nil/ports/ARMCMx/nilcore_v7m.h b/os/nil/ports/ARMCMx/nilcore_v7m.h index 41c038fcc..3ee6f15a8 100644 --- a/os/nil/ports/ARMCMx/nilcore_v7m.h +++ b/os/nil/ports/ARMCMx/nilcore_v7m.h @@ -455,7 +455,17 @@ static inline bool port_is_isr_context(void) { static inline void port_lock(void) {
#if CORTEX_SIMPLIFIED_PRIORITY == FALSE
+#if defined(__CM7_REV)
+#if __CM7_REV == 0
+ __disable_irq();
+#endif
+#endif
__set_BASEPRI(CORTEX_BASEPRI_KERNEL);
+#if defined(__CM7_REV)
+#if __CM7_REV == 0
+ __enable_irq();
+#endif
+#endif
#else /* CORTEX_SIMPLIFIED_PRIORITY */
__disable_irq();
#endif /* CORTEX_SIMPLIFIED_PRIORITY */
|