ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

critical: fix non valid configuration 

If any architecture is added, needs  to update critical exclusive access.

Also fixing if exclusive access is defined, we use the value.
pull/5597/head
Martin Kojtal 2017-11-28 12:02:41 +00:00
parent b37f24a2cd
commit 4118542bdf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/mbed_critical.c
View File

@ -25,17 +25,21 @@
#include "platform/mbed_toolchain.h" #include "platform/mbed_toolchain.h"
// if __EXCLUSIVE_ACCESS rtx macro not defined, we need to get this via own-set architecture macros // if __EXCLUSIVE_ACCESS rtx macro not defined, we need to get this via own-set architecture macros
#ifndef __EXCLUSIVE_ACCESS
#ifndef MBED_EXCLUSIVE_ACCESS #ifndef MBED_EXCLUSIVE_ACCESS
#ifndef __EXCLUSIVE_ACCESS
#if ((__ARM_ARCH_7M__ == 1U) || \ #if ((__ARM_ARCH_7M__ == 1U) || \
(__ARM_ARCH_7EM__ == 1U) || \ (__ARM_ARCH_7EM__ == 1U) || \
(__ARM_ARCH_8M_BASE__ == 1U) || \ (__ARM_ARCH_8M_BASE__ == 1U) || \
(__ARM_ARCH_8M_MAIN__ == 1U)) || \ (__ARM_ARCH_8M_MAIN__ == 1U)) || \
(__ARM_ARCH_7A__ == 1U) (__ARM_ARCH_7A__ == 1U)
#define MBED_EXCLUSIVE_ACCESS 1U #define MBED_EXCLUSIVE_ACCESS 1U
#else #elif (__ARM_ARCH_6M__ == 1U)
#define MBED_EXCLUSIVE_ACCESS 0U #define MBED_EXCLUSIVE_ACCESS 0U
#else
#error "Unknown architecture for exclusive access"
#endif #endif
#else
#define MBED_EXCLUSIVE_ACCESS __EXCLUSIVE_ACCESS
#endif #endif
#endif #endif