Update generated files

embassy-stm32/src/pac/stm32f401cb.rs

@@ -216,7 +216,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401cc.rs

@@ -216,7 +216,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401cd.rs

@@ -216,7 +216,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401ce.rs

@@ -216,7 +216,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401rb.rs

@@ -216,7 +216,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401rc.rs

@@ -216,7 +216,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401rd.rs

@@ -216,7 +216,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401re.rs

@@ -216,7 +216,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401vb.rs

@@ -224,7 +224,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401vc.rs

@@ -224,7 +224,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401vd.rs

@@ -224,7 +224,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f401ve.rs

@@ -224,7 +224,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405oe.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405og.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405rg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405vg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f405zg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407ie.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407ig.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407ve.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407vg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407ze.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f407zg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410c8.rs

@@ -150,7 +150,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410cb.rs

@@ -150,7 +150,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410r8.rs

@@ -150,7 +150,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410rb.rs

@@ -150,7 +150,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410t8.rs

@@ -143,7 +143,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f410tb.rs

@@ -143,7 +143,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411cc.rs

@@ -243,7 +243,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411ce.rs

@@ -243,7 +243,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411rc.rs

@@ -243,7 +243,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411re.rs

@@ -243,7 +243,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411vc.rs

@@ -243,7 +243,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f411ve.rs

@@ -243,7 +243,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412ce.rs

@@ -209,7 +209,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412cg.rs

@@ -209,7 +209,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412re.rs

@@ -239,7 +239,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412rg.rs

@@ -239,7 +239,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412ve.rs

@@ -311,7 +311,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412vg.rs

@@ -311,7 +311,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412ze.rs

@@ -311,7 +311,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f412zg.rs

@@ -311,7 +311,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413cg.rs

@@ -298,7 +298,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413ch.rs

@@ -298,7 +298,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413mg.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413mh.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413rg.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413rh.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413vg.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413vh.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413zg.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f413zh.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f415og.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f415rg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f415vg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f415zg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417ie.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417ig.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417ve.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417vg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417ze.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f417zg.rs

@@ -300,7 +300,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423ch.rs

@@ -298,7 +298,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423mh.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423rh.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423vh.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f423zh.rs

@@ -314,7 +314,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427ag.rs

@@ -354,7 +354,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427ai.rs

@@ -354,7 +354,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427ig.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427ii.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427vg.rs

@@ -346,7 +346,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427vi.rs

@@ -346,7 +346,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427zg.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f427zi.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ag.rs

@@ -354,7 +354,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ai.rs

@@ -354,7 +354,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429be.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429bg.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429bi.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ie.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ig.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ii.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ne.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ng.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ni.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ve.rs

@@ -346,7 +346,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429vg.rs

@@ -346,7 +346,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429vi.rs

@@ -346,7 +346,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429ze.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429zg.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f429zi.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f437ai.rs

@@ -354,7 +354,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f437ig.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f437ii.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f437vg.rs

@@ -346,7 +346,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f437vi.rs

@@ -346,7 +346,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;
 

embassy-stm32/src/pac/stm32f437zg.rs

@@ -359,7 +359,8 @@ pub fn DMA(n: u8) -> dma::Dma {
 }
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
 pub mod interrupt {
-    pub use cortex_m::interrupt::{CriticalSection, Mutex};
+    pub use bare_metal::Mutex;
+    pub use critical_section::CriticalSection;
     pub use embassy::interrupt::{declare, take, Interrupt};
     pub use embassy_extras::interrupt::Priority4 as Priority;