Merge #806

806: Add embassy-cortex-m crate. r=Dirbaio a=Dirbaio

- Move Interrupt and InterruptExecutor from `embassy` to `embassy-cortex-m`.
- Move Unborrow from `embassy` to `embassy-hal-common` (nothing in `embassy` requires it anymore)
- Move PeripheralMutex from `embassy-hal-common` to `embassy-cortex-m`.

Co-authored-by: Dario Nieuwenhuis <[email protected]>

6 files changed, 9 insertions, 9 deletions

diff --git a/examples/nrf/src/bin/multiprio.rs b/examples/nrf/src/bin/multiprio.rs
index 54f6606a9..abda18aa5 100644
--- a/examples/nrf/src/bin/multiprio.rs
+++ b/examples/nrf/src/bin/multiprio.rs
@@ -59,11 +59,11 @@
 
 use cortex_m_rt::entry;
 use defmt::{info, unwrap};
-use embassy::executor::{Executor, InterruptExecutor};
-use embassy::interrupt::InterruptExt;
 use embassy::time::{Duration, Instant, Timer};
 use embassy::util::Forever;
+use embassy_nrf::executor::{Executor, InterruptExecutor};
 use embassy_nrf::interrupt;
+use embassy_nrf::interrupt::InterruptExt;
 
 use defmt_rtt as _; // global logger
 use panic_probe as _;
diff --git a/examples/nrf/src/bin/usb_hid_keyboard.rs b/examples/nrf/src/bin/usb_hid_keyboard.rs
index d7affae11..98e7dd696 100644
--- a/examples/nrf/src/bin/usb_hid_keyboard.rs
+++ b/examples/nrf/src/bin/usb_hid_keyboard.rs
@@ -8,11 +8,11 @@ use core::sync::atomic::{AtomicBool, Ordering};
 use defmt::*;
 use embassy::channel::signal::Signal;
 use embassy::executor::Spawner;
-use embassy::interrupt::InterruptExt;
 use embassy::time::Duration;
 use embassy::util::{select, select3, Either, Either3};
 use embassy_nrf::gpio::{Input, Pin, Pull};
 use embassy_nrf::interrupt;
+use embassy_nrf::interrupt::InterruptExt;
 use embassy_nrf::pac;
 use embassy_nrf::usb::Driver;
 use embassy_nrf::Peripherals;
diff --git a/examples/stm32f3/src/bin/multiprio.rs b/examples/stm32f3/src/bin/multiprio.rs
index 02380de72..684295609 100644
--- a/examples/stm32f3/src/bin/multiprio.rs
+++ b/examples/stm32f3/src/bin/multiprio.rs
@@ -62,11 +62,11 @@ use defmt_rtt as _; // global logger
 use panic_probe as _;
 
 use cortex_m_rt::entry;
-use embassy::executor::{Executor, InterruptExecutor};
-use embassy::interrupt::InterruptExt;
 use embassy::time::{Duration, Instant, Timer};
 use embassy::util::Forever;
+use embassy_stm32::executor::{Executor, InterruptExecutor};
 use embassy_stm32::interrupt;
+use embassy_stm32::interrupt::InterruptExt;
 
 #[embassy::task]
 async fn run_high() {
diff --git a/examples/stm32f4/src/bin/multiprio.rs b/examples/stm32f4/src/bin/multiprio.rs
index 02380de72..684295609 100644
--- a/examples/stm32f4/src/bin/multiprio.rs
+++ b/examples/stm32f4/src/bin/multiprio.rs
@@ -62,11 +62,11 @@ use defmt_rtt as _; // global logger
 use panic_probe as _;
 
 use cortex_m_rt::entry;
-use embassy::executor::{Executor, InterruptExecutor};
-use embassy::interrupt::InterruptExt;
 use embassy::time::{Duration, Instant, Timer};
 use embassy::util::Forever;
+use embassy_stm32::executor::{Executor, InterruptExecutor};
 use embassy_stm32::interrupt;
+use embassy_stm32::interrupt::InterruptExt;
 
 #[embassy::task]
 async fn run_high() {
diff --git a/examples/stm32h7/src/bin/low_level_timer_api.rs b/examples/stm32h7/src/bin/low_level_timer_api.rs
index 3b1b8044d..647c5a8fa 100644
--- a/examples/stm32h7/src/bin/low_level_timer_api.rs
+++ b/examples/stm32h7/src/bin/low_level_timer_api.rs
@@ -9,12 +9,12 @@ use panic_probe as _;
 use defmt::*;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
-use embassy::util::Unborrow;
 use embassy_stm32::gpio::low_level::AFType;
 use embassy_stm32::gpio::Speed;
 use embassy_stm32::pwm::*;
 use embassy_stm32::time::{Hertz, U32Ext};
 use embassy_stm32::unborrow;
+use embassy_stm32::Unborrow;
 use embassy_stm32::{Config, Peripherals};
 
 pub fn config() -> Config {
diff --git a/examples/stm32wl/src/bin/subghz.rs b/examples/stm32wl/src/bin/subghz.rs
index 562e25ac0..f5f9b6a32 100644
--- a/examples/stm32wl/src/bin/subghz.rs
+++ b/examples/stm32wl/src/bin/subghz.rs
@@ -10,11 +10,11 @@ use panic_probe as _;
 
 use defmt::*;
 use embassy::channel::signal::Signal;
-use embassy::interrupt::{Interrupt, InterruptExt};
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::exti::ExtiInput;
 use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
 use embassy_stm32::interrupt;
+use embassy_stm32::interrupt::{Interrupt, InterruptExt};
 use embassy_stm32::subghz::*;
 use embassy_stm32::Peripherals;