Improve compatibility with CMSIS 6.1.0

Fix __sev, __wfi, __wfe, and __dmb issues
raspberrypi · May 22, 2024 · f655f8e · f655f8e
1 parent 6d5064c
commit f655f8e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/RaspberryPi.RP2xxx_DFP.pdsc b/RaspberryPi.RP2xxx_DFP.pdsc
@@ -310,7 +310,7 @@
         <files>
 
             <file category="include"                name="__wrapper/" />
-            <file category="preIncludeGlobal"       name="__wrapper/env_wrapper.h" version="1.5.1" attr="config" />
+            <file category="preIncludeGlobal"       name="__wrapper/env_wrapper.h" version="1.5.2" attr="config" />
             <file category="sourceC"                name="__wrapper/env_wrapper.c" />
 
 

diff --git a/__wrapper/env_wrapper.h b/__wrapper/env_wrapper.h
@@ -178,7 +178,10 @@ typedef unsigned int        uint;
 #define __wfi       __builtin_arm_wfi
 #define __wfe       __builtin_arm_wfe
 
-#define __dmb       __DMB
+#define __dmb0()    __builtin_arm_dmb(0xF)
+#define __dmb1(__N) __builtin_arm_dmb(__N)
+
+#define __dmb(...)  __CONCAT(__dmb, __PLOOC_VA_NUM_ARGS(__VA_ARGS__))(__VA_ARGS__)
 
 #define __dsb       __DSB
 #define __isb       __ISB

diff --git a/pico-sdk b/pico-sdk