From 5085100df2845745f13715669c18a785a374a879 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Sat, 11 Jun 2022 05:08:57 +0200 Subject: Add embassy-cortex-m crate. - 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`. --- examples/nrf/src/bin/multiprio.rs | 4 ++-- examples/nrf/src/bin/usb_hid_keyboard.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/nrf/src') 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 d855a3a57..8aa08fe3d 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; 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; -- cgit