From f655f8e88bf5de54b86bf85aea40fb833eadac16 Mon Sep 17 00:00:00 2001
From: William Vinnicombe <william.vinnicombe@raspberrypi.com>
Date: Wed, 22 May 2024 10:57:37 +0100
Subject: [PATCH] Improve compatibility with CMSIS 6.1.0

Fix __sev, __wfi, __wfe, and __dmb issues
---
 RaspberryPi.RP2xxx_DFP.pdsc | 2 +-
 __wrapper/env_wrapper.h     | 5 ++++-
 pico-sdk                    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RaspberryPi.RP2xxx_DFP.pdsc b/RaspberryPi.RP2xxx_DFP.pdsc
index ab190b7..2db9a88 100644
--- 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
index 081ddfc..e45dddf 100644
--- 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
index f9c5f6a..46c2071 160000
--- a/pico-sdk
+++ b/pico-sdk
@@ -1 +1 @@
-Subproject commit f9c5f6a2d698e316d34f5affcfbee0c2bc7b4e68
+Subproject commit 46c207194f27e024100a3943c37a4c7d71fdf642