cfg-gate interrupt::free, use new name for embedded_hal.

Author: adamgreig

cortex-m/Cargo.toml

@@ -18,7 +18,7 @@ rust-version = "1.61"
 
 [dependencies]
 bare-metal = { version = "0.2.4", features = ["const-fn"] }
-critical-section = { version = "1.0.0", optional = true }
+critical-section = "1.0.0"
 volatile-register = "0.2.2"
 bitfield = "0.13.2"
 eh0 = { package = "embedded-hal", version = "0.2.4" }

cortex-m/src/interrupt.rs

@@ -51,6 +51,7 @@ pub unsafe fn enable() {
 /// Execute closure `f` in an interrupt-free context.
 ///
 /// This as also known as a "critical section".
+#[cfg(cortex_m)]
 #[inline]
 pub fn free<F, R>(f: F) -> R
 where
@@ -72,3 +73,15 @@ where
 
     r
 }
+
+// Make a `free()` function available to allow checking dependencies without specifying a target,
+// but that will panic at runtime if executed.
+#[doc(hidden)]
+#[cfg(not(cortex_m))]
+#[inline]
+pub fn free<F, R>(_: F) -> R
+where
+    F: FnOnce(&CriticalSection) -> R,
+{
+    panic!("cortex_m::interrupt::free() is only functional on cortex-m platforms");
+}

cortex-m/src/peripheral/mod.rs

@@ -60,8 +60,6 @@
 use core::marker::PhantomData;
 use core::ops;
 
-use crate::interrupt;
-
 #[cfg(feature = "cm7")]
 pub mod ac;
 #[cfg(not(armv6m))]
@@ -165,7 +163,7 @@ impl Peripherals {
     /// Returns all the core peripherals *once*
     #[inline]
     pub fn take() -> Option<Self> {
-        interrupt::free(|_| {
+        crate::interrupt::free(|_| {
             if unsafe { TAKEN } {
                 None
             } else {

cortex-m/src/prelude.rs

@@ -1,3 +1,3 @@
 //! Prelude
 
-pub use embedded_hal::prelude::*;
+pub use eh0::prelude::*;