diff options
Diffstat (limited to 'embassy-nrf/src/timer.rs')
| -rw-r--r-- | embassy-nrf/src/timer.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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; | |||
| 5 | 5 | ||
| 6 | use embassy::interrupt::Interrupt; | 6 | use embassy::interrupt::Interrupt; |
| 7 | use embassy::interrupt::InterruptExt; | 7 | use embassy::interrupt::InterruptExt; |
| 8 | use embassy::util::OnDrop; | ||
| 9 | use embassy::util::Unborrow; | 8 | use embassy::util::Unborrow; |
| 9 | use embassy::waitqueue::AtomicWaker; | ||
| 10 | use embassy_hal_common::drop::OnDrop; | ||
| 10 | use embassy_hal_common::unborrow; | 11 | use embassy_hal_common::unborrow; |
| 11 | use futures::future::poll_fn; | 12 | use futures::future::poll_fn; |
| 12 | 13 | ||
| @@ -15,7 +16,6 @@ use crate::ppi::Event; | |||
| 15 | use crate::ppi::Task; | 16 | use crate::ppi::Task; |
| 16 | 17 | ||
| 17 | pub(crate) mod sealed { | 18 | pub(crate) mod sealed { |
| 18 | use embassy::util::AtomicWaker; | ||
| 19 | 19 | ||
| 20 | use super::*; | 20 | use super::*; |
| 21 | 21 | ||
| @@ -43,8 +43,8 @@ macro_rules! impl_timer { | |||
| 43 | fn regs() -> &'static pac::timer0::RegisterBlock { | 43 | fn regs() -> &'static pac::timer0::RegisterBlock { |
| 44 | unsafe { &*(pac::$pac_type::ptr() as *const pac::timer0::RegisterBlock) } | 44 | unsafe { &*(pac::$pac_type::ptr() as *const pac::timer0::RegisterBlock) } |
| 45 | } | 45 | } |
| 46 | fn waker(n: usize) -> &'static ::embassy::util::AtomicWaker { | 46 | fn waker(n: usize) -> &'static ::embassy::waitqueue::AtomicWaker { |
| 47 | use ::embassy::util::AtomicWaker; | 47 | use ::embassy::waitqueue::AtomicWaker; |
| 48 | const NEW_AW: AtomicWaker = AtomicWaker::new(); | 48 | const NEW_AW: AtomicWaker = AtomicWaker::new(); |
| 49 | static WAKERS: [AtomicWaker; $ccs] = [NEW_AW; $ccs]; | 49 | static WAKERS: [AtomicWaker; $ccs] = [NEW_AW; $ccs]; |
| 50 | &WAKERS[n] | 50 | &WAKERS[n] |
