diff options
| -rw-r--r-- | embassy-nrf-examples/Cargo.toml | 4 | ||||
| -rw-r--r-- | embassy-nrf/src/qspi.rs | 5 | ||||
| -rw-r--r-- | embassy-nrf/src/util/peripheral.rs | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/embassy-nrf-examples/Cargo.toml b/embassy-nrf-examples/Cargo.toml index b7e4c340c..cf82a475f 100644 --- a/embassy-nrf-examples/Cargo.toml +++ b/embassy-nrf-examples/Cargo.toml | |||
| @@ -17,8 +17,8 @@ defmt-error = [] | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | [dependencies] | 19 | [dependencies] |
| 20 | embassy = { version = "0.1.0", path = "../embassy", features = ["defmt"] } | 20 | embassy = { version = "0.1.0", path = "../embassy", features = ["defmt", "defmt-trace"] } |
| 21 | embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt", "52840"] } | 21 | embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt", "defmt-trace", "52840"] } |
| 22 | 22 | ||
| 23 | defmt = "0.2.0" | 23 | defmt = "0.2.0" |
| 24 | defmt-rtt = "0.2.0" | 24 | defmt-rtt = "0.2.0" |
diff --git a/embassy-nrf/src/qspi.rs b/embassy-nrf/src/qspi.rs index c238a6c82..bee6abfa1 100644 --- a/embassy-nrf/src/qspi.rs +++ b/embassy-nrf/src/qspi.rs | |||
| @@ -1,11 +1,10 @@ | |||
| 1 | use core::future::Future; | 1 | use core::future::Future; |
| 2 | use core::pin::Pin; | 2 | use core::pin::Pin; |
| 3 | use core::sync::atomic::{compiler_fence, Ordering}; | ||
| 4 | use core::task::Poll; | 3 | use core::task::Poll; |
| 5 | 4 | ||
| 6 | use crate::fmt::{assert, assert_eq, *}; | 5 | use crate::fmt::{assert, assert_eq, *}; |
| 7 | use crate::hal::gpio::{Output, Pin as GpioPin, Port as GpioPort, PushPull}; | 6 | use crate::hal::gpio::{Output, Pin as GpioPin, Port as GpioPort, PushPull}; |
| 8 | use crate::interrupt::{self, Interrupt}; | 7 | use crate::interrupt::{self}; |
| 9 | use crate::pac::QSPI; | 8 | use crate::pac::QSPI; |
| 10 | 9 | ||
| 11 | pub use crate::pac::qspi::ifconfig0::ADDRMODE_A as AddressMode; | 10 | pub use crate::pac::qspi::ifconfig0::ADDRMODE_A as AddressMode; |
| @@ -258,7 +257,7 @@ impl Qspi { | |||
| 258 | 257 | ||
| 259 | fn wait_ready<'a>(mut self: Pin<&'a mut Self>) -> impl Future<Output = ()> + 'a { | 258 | fn wait_ready<'a>(mut self: Pin<&'a mut Self>) -> impl Future<Output = ()> + 'a { |
| 260 | poll_fn(move |cx| { | 259 | poll_fn(move |cx| { |
| 261 | self.as_mut().inner().with(|s, irq| { | 260 | self.as_mut().inner().with(|s, _irq| { |
| 262 | if s.inner.events_ready.read().bits() != 0 { | 261 | if s.inner.events_ready.read().bits() != 0 { |
| 263 | return Poll::Ready(()); | 262 | return Poll::Ready(()); |
| 264 | } | 263 | } |
diff --git a/embassy-nrf/src/util/peripheral.rs b/embassy-nrf/src/util/peripheral.rs index b23699d24..bfb023f56 100644 --- a/embassy-nrf/src/util/peripheral.rs +++ b/embassy-nrf/src/util/peripheral.rs | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | use core::array::IntoIter; | ||
| 2 | use core::cell::UnsafeCell; | 1 | use core::cell::UnsafeCell; |
| 3 | use core::marker::{PhantomData, PhantomPinned}; | 2 | use core::marker::{PhantomData, PhantomPinned}; |
| 4 | use core::mem::MaybeUninit; | 3 | use core::mem::MaybeUninit; |
