From ead987245d083b7e6be7158ea3fb63c8a47bf304 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Sat, 11 Sep 2021 01:53:53 +0200 Subject: embassy: Refactor module structure to remove kitchen-sink `util`. --- embassy-nrf/src/buffered_uarte.rs | 3 ++- embassy-nrf/src/gpiote.rs | 2 +- embassy-nrf/src/qspi.rs | 5 ++++- embassy-nrf/src/rng.rs | 4 ++-- embassy-nrf/src/saadc.rs | 3 ++- embassy-nrf/src/spim.rs | 4 +++- embassy-nrf/src/time_driver.rs | 2 +- embassy-nrf/src/timer.rs | 8 ++++---- embassy-nrf/src/twim.rs | 3 ++- embassy-nrf/src/uarte.rs | 5 ++++- 10 files changed, 25 insertions(+), 14 deletions(-) (limited to 'embassy-nrf/src') diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs index 90ce49582..cd08875cd 100644 --- a/embassy-nrf/src/buffered_uarte.rs +++ b/embassy-nrf/src/buffered_uarte.rs @@ -6,7 +6,8 @@ use core::sync::atomic::{compiler_fence, Ordering}; use core::task::{Context, Poll}; use embassy::interrupt::InterruptExt; use embassy::io::{AsyncBufRead, AsyncWrite, Result}; -use embassy::util::{Unborrow, WakerRegistration}; +use embassy::util::Unborrow; +use embassy::waitqueue::WakerRegistration; use embassy_hal_common::peripheral::{PeripheralMutex, PeripheralState, StateStorage}; use embassy_hal_common::ring_buffer::RingBuffer; use embassy_hal_common::{low_power_wait_until, unborrow}; diff --git a/embassy-nrf/src/gpiote.rs b/embassy-nrf/src/gpiote.rs index 847b2fbf3..001ee7fb8 100644 --- a/embassy-nrf/src/gpiote.rs +++ b/embassy-nrf/src/gpiote.rs @@ -4,7 +4,7 @@ use core::marker::PhantomData; use core::task::{Context, Poll}; use embassy::interrupt::{Interrupt, InterruptExt}; use embassy::traits::gpio::{WaitForAnyEdge, WaitForHigh, WaitForLow}; -use embassy::util::AtomicWaker; +use embassy::waitqueue::AtomicWaker; use embassy_hal_common::unsafe_impl_unborrow; use embedded_hal::digital::v2::{InputPin, StatefulOutputPin}; use futures::future::poll_fn; diff --git a/embassy-nrf/src/qspi.rs b/embassy-nrf/src/qspi.rs index 28becfd56..e87094250 100644 --- a/embassy-nrf/src/qspi.rs +++ b/embassy-nrf/src/qspi.rs @@ -6,7 +6,8 @@ use core::ptr; use core::task::Poll; use embassy::interrupt::{Interrupt, InterruptExt}; use embassy::traits::flash::{Error, Flash}; -use embassy::util::{AtomicWaker, DropBomb, Unborrow}; +use embassy::util::Unborrow; +use embassy_hal_common::drop::DropBomb; use embassy_hal_common::unborrow; use futures::future::poll_fn; @@ -397,6 +398,8 @@ impl<'d, T: Instance> Flash for Qspi<'d, T> { } pub(crate) mod sealed { + use embassy::waitqueue::AtomicWaker; + use super::*; pub struct State { diff --git a/embassy-nrf/src/rng.rs b/embassy-nrf/src/rng.rs index 6cdcccf3b..20d033a12 100644 --- a/embassy-nrf/src/rng.rs +++ b/embassy-nrf/src/rng.rs @@ -8,9 +8,9 @@ use core::task::Poll; use embassy::interrupt::InterruptExt; use embassy::traits; -use embassy::util::AtomicWaker; -use embassy::util::OnDrop; use embassy::util::Unborrow; +use embassy::waitqueue::AtomicWaker; +use embassy_hal_common::drop::OnDrop; use embassy_hal_common::unborrow; use futures::future::poll_fn; use rand_core::RngCore; diff --git a/embassy-nrf/src/saadc.rs b/embassy-nrf/src/saadc.rs index bc7f34716..e909e7d5a 100644 --- a/embassy-nrf/src/saadc.rs +++ b/embassy-nrf/src/saadc.rs @@ -3,7 +3,8 @@ use core::marker::PhantomData; use core::sync::atomic::{compiler_fence, Ordering}; use core::task::Poll; use embassy::interrupt::InterruptExt; -use embassy::util::{AtomicWaker, Unborrow}; +use embassy::util::Unborrow; +use embassy::waitqueue::AtomicWaker; use embassy_hal_common::unborrow; use futures::future::poll_fn; diff --git a/embassy-nrf/src/spim.rs b/embassy-nrf/src/spim.rs index 9a7fb4f67..e88fb460c 100644 --- a/embassy-nrf/src/spim.rs +++ b/embassy-nrf/src/spim.rs @@ -6,7 +6,7 @@ use core::sync::atomic::{compiler_fence, Ordering}; use core::task::Poll; use embassy::interrupt::InterruptExt; use embassy::traits; -use embassy::util::{AtomicWaker, Unborrow}; +use embassy::util::Unborrow; use embassy_hal_common::unborrow; use futures::future::poll_fn; use traits::spi::{FullDuplex, Read, Spi, Write}; @@ -359,6 +359,8 @@ impl<'d, T: Instance> embedded_hal::blocking::spi::Write for Spim<'d, T> { } pub(crate) mod sealed { + use embassy::waitqueue::AtomicWaker; + use super::*; pub struct State { diff --git a/embassy-nrf/src/time_driver.rs b/embassy-nrf/src/time_driver.rs index f93ebb54a..19356c2d2 100644 --- a/embassy-nrf/src/time_driver.rs +++ b/embassy-nrf/src/time_driver.rs @@ -2,9 +2,9 @@ use core::cell::Cell; use core::sync::atomic::{compiler_fence, AtomicU32, AtomicU8, Ordering}; use core::{mem, ptr}; use critical_section::CriticalSection; +use embassy::blocking_mutex::CriticalSectionMutex as Mutex; use embassy::interrupt::{Interrupt, InterruptExt}; use embassy::time::driver::{AlarmHandle, Driver}; -use embassy::util::CriticalSectionMutex as Mutex; use crate::interrupt; use crate::pac; diff --git a/embassy-nrf/src/timer.rs b/embassy-nrf/src/timer.rs index 638fd8229..5690ff0d8 100644 --- a/embassy-nrf/src/timer.rs +++ b/embassy-nrf/src/timer.rs @@ -5,8 +5,9 @@ use core::task::Poll; use embassy::interrupt::Interrupt; use embassy::interrupt::InterruptExt; -use embassy::util::OnDrop; use embassy::util::Unborrow; +use embassy::waitqueue::AtomicWaker; +use embassy_hal_common::drop::OnDrop; use embassy_hal_common::unborrow; use futures::future::poll_fn; @@ -15,7 +16,6 @@ use crate::ppi::Event; use crate::ppi::Task; pub(crate) mod sealed { - use embassy::util::AtomicWaker; use super::*; @@ -43,8 +43,8 @@ macro_rules! impl_timer { fn regs() -> &'static pac::timer0::RegisterBlock { unsafe { &*(pac::$pac_type::ptr() as *const pac::timer0::RegisterBlock) } } - fn waker(n: usize) -> &'static ::embassy::util::AtomicWaker { - use ::embassy::util::AtomicWaker; + fn waker(n: usize) -> &'static ::embassy::waitqueue::AtomicWaker { + use ::embassy::waitqueue::AtomicWaker; const NEW_AW: AtomicWaker = AtomicWaker::new(); static WAKERS: [AtomicWaker; $ccs] = [NEW_AW; $ccs]; &WAKERS[n] diff --git a/embassy-nrf/src/twim.rs b/embassy-nrf/src/twim.rs index ac263bad7..8173f66b0 100644 --- a/embassy-nrf/src/twim.rs +++ b/embassy-nrf/src/twim.rs @@ -12,7 +12,8 @@ use core::sync::atomic::{compiler_fence, Ordering::SeqCst}; use core::task::Poll; use embassy::interrupt::{Interrupt, InterruptExt}; use embassy::traits; -use embassy::util::{AtomicWaker, Unborrow}; +use embassy::util::Unborrow; +use embassy::waitqueue::AtomicWaker; use embassy_hal_common::unborrow; use futures::future::poll_fn; use traits::i2c::I2c; diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index a6909be68..320426060 100644 --- a/embassy-nrf/src/uarte.rs +++ b/embassy-nrf/src/uarte.rs @@ -8,7 +8,8 @@ use core::sync::atomic::{compiler_fence, Ordering}; use core::task::Poll; use embassy::interrupt::InterruptExt; use embassy::traits::uart::{Error, Read, ReadUntilIdle, Write}; -use embassy::util::{AtomicWaker, OnDrop, Unborrow}; +use embassy::util::Unborrow; +use embassy_hal_common::drop::OnDrop; use embassy_hal_common::unborrow; use futures::future::poll_fn; @@ -439,6 +440,8 @@ impl<'d, U: Instance, T: TimerInstance> Write for UarteWithIdle<'d, U, T> { } pub(crate) mod sealed { + use embassy::waitqueue::AtomicWaker; + use super::*; pub struct State { -- cgit