aboutsummaryrefslogtreecommitdiff
path: root/embassy-nrf/src
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-09-22 16:42:49 +0200
committerDario Nieuwenhuis <[email protected]>2022-09-22 16:42:49 +0200
commita0487380da42a71ab7532e2bc1befd1039c18a78 (patch)
treebb235fc3ba54f31838f3b546f7b4734ee8b42558 /embassy-nrf/src
parent897b72c872183221e088611aa6f30989800afd2b (diff)
Replace futures::future::poll_fn -> core::future::poll_fn.
Diffstat (limited to 'embassy-nrf/src')
-rw-r--r--embassy-nrf/src/buffered_uarte.rs3
-rw-r--r--embassy-nrf/src/gpiote.rs3
-rw-r--r--embassy-nrf/src/qdec.rs2
-rw-r--r--embassy-nrf/src/qspi.rs2
-rw-r--r--embassy-nrf/src/rng.rs2
-rw-r--r--embassy-nrf/src/saadc.rs2
-rw-r--r--embassy-nrf/src/spim.rs2
-rw-r--r--embassy-nrf/src/temp.rs2
-rw-r--r--embassy-nrf/src/timer.rs2
-rw-r--r--embassy-nrf/src/twim.rs3
-rw-r--r--embassy-nrf/src/uarte.rs2
-rw-r--r--embassy-nrf/src/usb.rs3
12 files changed, 12 insertions, 16 deletions
diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs
index c3cba2470..fec875cb8 100644
--- a/embassy-nrf/src/buffered_uarte.rs
+++ b/embassy-nrf/src/buffered_uarte.rs
@@ -15,7 +15,7 @@
15 15
16use core::cell::RefCell; 16use core::cell::RefCell;
17use core::cmp::min; 17use core::cmp::min;
18use core::future::Future; 18use core::future::{poll_fn, Future};
19use core::sync::atomic::{compiler_fence, Ordering}; 19use core::sync::atomic::{compiler_fence, Ordering};
20use core::task::Poll; 20use core::task::Poll;
21 21
@@ -23,7 +23,6 @@ use embassy_cortex_m::peripheral::{PeripheralMutex, PeripheralState, StateStorag
23use embassy_hal_common::ring_buffer::RingBuffer; 23use embassy_hal_common::ring_buffer::RingBuffer;
24use embassy_hal_common::{into_ref, PeripheralRef}; 24use embassy_hal_common::{into_ref, PeripheralRef};
25use embassy_sync::waitqueue::WakerRegistration; 25use embassy_sync::waitqueue::WakerRegistration;
26use futures::future::poll_fn;
27// Re-export SVD variants to allow user to directly set values 26// Re-export SVD variants to allow user to directly set values
28pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity}; 27pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity};
29 28
diff --git a/embassy-nrf/src/gpiote.rs b/embassy-nrf/src/gpiote.rs
index d99f592b0..b418be9d5 100644
--- a/embassy-nrf/src/gpiote.rs
+++ b/embassy-nrf/src/gpiote.rs
@@ -1,10 +1,9 @@
1use core::convert::Infallible; 1use core::convert::Infallible;
2use core::future::Future; 2use core::future::{poll_fn, Future};
3use core::task::{Context, Poll}; 3use core::task::{Context, Poll};
4 4
5use embassy_hal_common::{impl_peripheral, Peripheral, PeripheralRef}; 5use embassy_hal_common::{impl_peripheral, Peripheral, PeripheralRef};
6use embassy_sync::waitqueue::AtomicWaker; 6use embassy_sync::waitqueue::AtomicWaker;
7use futures::future::poll_fn;
8 7
9use crate::gpio::sealed::Pin as _; 8use crate::gpio::sealed::Pin as _;
10use crate::gpio::{AnyPin, Flex, Input, Output, Pin as GpioPin}; 9use crate::gpio::{AnyPin, Flex, Input, Output, Pin as GpioPin};
diff --git a/embassy-nrf/src/qdec.rs b/embassy-nrf/src/qdec.rs
index 762e09715..253c85c32 100644
--- a/embassy-nrf/src/qdec.rs
+++ b/embassy-nrf/src/qdec.rs
@@ -1,10 +1,10 @@
1//! Quadrature decoder interface 1//! Quadrature decoder interface
2 2
3use core::future::poll_fn;
3use core::task::Poll; 4use core::task::Poll;
4 5
5use embassy_hal_common::{into_ref, PeripheralRef}; 6use embassy_hal_common::{into_ref, PeripheralRef};
6use embassy_sync::waitqueue::AtomicWaker; 7use embassy_sync::waitqueue::AtomicWaker;
7use futures::future::poll_fn;
8 8
9use crate::gpio::sealed::Pin as _; 9use crate::gpio::sealed::Pin as _;
10use crate::gpio::{AnyPin, Pin as GpioPin}; 10use crate::gpio::{AnyPin, Pin as GpioPin};
diff --git a/embassy-nrf/src/qspi.rs b/embassy-nrf/src/qspi.rs
index c97cb1656..ea0a17031 100644
--- a/embassy-nrf/src/qspi.rs
+++ b/embassy-nrf/src/qspi.rs
@@ -1,11 +1,11 @@
1#![macro_use] 1#![macro_use]
2 2
3use core::future::poll_fn;
3use core::ptr; 4use core::ptr;
4use core::task::Poll; 5use core::task::Poll;
5 6
6use embassy_hal_common::drop::DropBomb; 7use embassy_hal_common::drop::DropBomb;
7use embassy_hal_common::{into_ref, PeripheralRef}; 8use embassy_hal_common::{into_ref, PeripheralRef};
8use futures::future::poll_fn;
9 9
10use crate::gpio::{self, Pin as GpioPin}; 10use crate::gpio::{self, Pin as GpioPin};
11use crate::interrupt::{Interrupt, InterruptExt}; 11use crate::interrupt::{Interrupt, InterruptExt};
diff --git a/embassy-nrf/src/rng.rs b/embassy-nrf/src/rng.rs
index 42da51d0f..e0caeaaee 100644
--- a/embassy-nrf/src/rng.rs
+++ b/embassy-nrf/src/rng.rs
@@ -1,3 +1,4 @@
1use core::future::poll_fn;
1use core::ptr; 2use core::ptr;
2use core::sync::atomic::{AtomicPtr, Ordering}; 3use core::sync::atomic::{AtomicPtr, Ordering};
3use core::task::Poll; 4use core::task::Poll;
@@ -5,7 +6,6 @@ use core::task::Poll;
5use embassy_hal_common::drop::OnDrop; 6use embassy_hal_common::drop::OnDrop;
6use embassy_hal_common::{into_ref, PeripheralRef}; 7use embassy_hal_common::{into_ref, PeripheralRef};
7use embassy_sync::waitqueue::AtomicWaker; 8use embassy_sync::waitqueue::AtomicWaker;
8use futures::future::poll_fn;
9 9
10use crate::interrupt::InterruptExt; 10use crate::interrupt::InterruptExt;
11use crate::peripherals::RNG; 11use crate::peripherals::RNG;
diff --git a/embassy-nrf/src/saadc.rs b/embassy-nrf/src/saadc.rs
index 9bc89eb38..d1c82423e 100644
--- a/embassy-nrf/src/saadc.rs
+++ b/embassy-nrf/src/saadc.rs
@@ -1,12 +1,12 @@
1#![macro_use] 1#![macro_use]
2 2
3use core::future::poll_fn;
3use core::sync::atomic::{compiler_fence, Ordering}; 4use core::sync::atomic::{compiler_fence, Ordering};
4use core::task::Poll; 5use core::task::Poll;
5 6
6use embassy_hal_common::drop::OnDrop; 7use embassy_hal_common::drop::OnDrop;
7use embassy_hal_common::{impl_peripheral, into_ref, PeripheralRef}; 8use embassy_hal_common::{impl_peripheral, into_ref, PeripheralRef};
8use embassy_sync::waitqueue::AtomicWaker; 9use embassy_sync::waitqueue::AtomicWaker;
9use futures::future::poll_fn;
10use pac::{saadc, SAADC}; 10use pac::{saadc, SAADC};
11use saadc::ch::config::{GAIN_A, REFSEL_A, RESP_A, TACQ_A}; 11use saadc::ch::config::{GAIN_A, REFSEL_A, RESP_A, TACQ_A};
12// We treat the positive and negative channels with the same enum values to keep our type tidy and given they are the same 12// We treat the positive and negative channels with the same enum values to keep our type tidy and given they are the same
diff --git a/embassy-nrf/src/spim.rs b/embassy-nrf/src/spim.rs
index 2955182e4..51cd73a47 100644
--- a/embassy-nrf/src/spim.rs
+++ b/embassy-nrf/src/spim.rs
@@ -1,12 +1,12 @@
1#![macro_use] 1#![macro_use]
2 2
3use core::future::poll_fn;
3use core::sync::atomic::{compiler_fence, Ordering}; 4use core::sync::atomic::{compiler_fence, Ordering};
4use core::task::Poll; 5use core::task::Poll;
5 6
6use embassy_embedded_hal::SetConfig; 7use embassy_embedded_hal::SetConfig;
7use embassy_hal_common::{into_ref, PeripheralRef}; 8use embassy_hal_common::{into_ref, PeripheralRef};
8pub use embedded_hal_02::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3}; 9pub use embedded_hal_02::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
9use futures::future::poll_fn;
10pub use pac::spim0::frequency::FREQUENCY_A as Frequency; 10pub use pac::spim0::frequency::FREQUENCY_A as Frequency;
11 11
12use crate::chip::FORCE_COPY_BUFFER_SIZE; 12use crate::chip::FORCE_COPY_BUFFER_SIZE;
diff --git a/embassy-nrf/src/temp.rs b/embassy-nrf/src/temp.rs
index d520fd686..7a7f61b51 100644
--- a/embassy-nrf/src/temp.rs
+++ b/embassy-nrf/src/temp.rs
@@ -1,12 +1,12 @@
1//! Temperature sensor interface. 1//! Temperature sensor interface.
2 2
3use core::future::poll_fn;
3use core::task::Poll; 4use core::task::Poll;
4 5
5use embassy_hal_common::drop::OnDrop; 6use embassy_hal_common::drop::OnDrop;
6use embassy_hal_common::{into_ref, PeripheralRef}; 7use embassy_hal_common::{into_ref, PeripheralRef};
7use embassy_sync::waitqueue::AtomicWaker; 8use embassy_sync::waitqueue::AtomicWaker;
8use fixed::types::I30F2; 9use fixed::types::I30F2;
9use futures::future::poll_fn;
10 10
11use crate::interrupt::InterruptExt; 11use crate::interrupt::InterruptExt;
12use crate::peripherals::TEMP; 12use crate::peripherals::TEMP;
diff --git a/embassy-nrf/src/timer.rs b/embassy-nrf/src/timer.rs
index 3de5a8962..bc8710640 100644
--- a/embassy-nrf/src/timer.rs
+++ b/embassy-nrf/src/timer.rs
@@ -1,12 +1,12 @@
1#![macro_use] 1#![macro_use]
2 2
3use core::future::poll_fn;
3use core::marker::PhantomData; 4use core::marker::PhantomData;
4use core::task::Poll; 5use core::task::Poll;
5 6
6use embassy_hal_common::drop::OnDrop; 7use embassy_hal_common::drop::OnDrop;
7use embassy_hal_common::{into_ref, PeripheralRef}; 8use embassy_hal_common::{into_ref, PeripheralRef};
8use embassy_sync::waitqueue::AtomicWaker; 9use embassy_sync::waitqueue::AtomicWaker;
9use futures::future::poll_fn;
10 10
11use crate::interrupt::{Interrupt, InterruptExt}; 11use crate::interrupt::{Interrupt, InterruptExt};
12use crate::ppi::{Event, Task}; 12use crate::ppi::{Event, Task};
diff --git a/embassy-nrf/src/twim.rs b/embassy-nrf/src/twim.rs
index 3d4af753a..7c6ca1d30 100644
--- a/embassy-nrf/src/twim.rs
+++ b/embassy-nrf/src/twim.rs
@@ -6,7 +6,7 @@
6//! 6//!
7//! - nRF52832: Section 33 7//! - nRF52832: Section 33
8//! - nRF52840: Section 6.31 8//! - nRF52840: Section 6.31
9use core::future::Future; 9use core::future::{poll_fn, Future};
10use core::sync::atomic::compiler_fence; 10use core::sync::atomic::compiler_fence;
11use core::sync::atomic::Ordering::SeqCst; 11use core::sync::atomic::Ordering::SeqCst;
12use core::task::Poll; 12use core::task::Poll;
@@ -16,7 +16,6 @@ use embassy_hal_common::{into_ref, PeripheralRef};
16use embassy_sync::waitqueue::AtomicWaker; 16use embassy_sync::waitqueue::AtomicWaker;
17#[cfg(feature = "time")] 17#[cfg(feature = "time")]
18use embassy_time::{Duration, Instant}; 18use embassy_time::{Duration, Instant};
19use futures::future::poll_fn;
20 19
21use crate::chip::{EASY_DMA_SIZE, FORCE_COPY_BUFFER_SIZE}; 20use crate::chip::{EASY_DMA_SIZE, FORCE_COPY_BUFFER_SIZE};
22use crate::gpio::Pin as GpioPin; 21use crate::gpio::Pin as GpioPin;
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs
index c250e24ca..5f9c4f17d 100644
--- a/embassy-nrf/src/uarte.rs
+++ b/embassy-nrf/src/uarte.rs
@@ -13,12 +13,12 @@
13//! memory may be used given that buffers are passed in directly to its read and write 13//! memory may be used given that buffers are passed in directly to its read and write
14//! methods. 14//! methods.
15 15
16use core::future::poll_fn;
16use core::sync::atomic::{compiler_fence, Ordering}; 17use core::sync::atomic::{compiler_fence, Ordering};
17use core::task::Poll; 18use core::task::Poll;
18 19
19use embassy_hal_common::drop::OnDrop; 20use embassy_hal_common::drop::OnDrop;
20use embassy_hal_common::{into_ref, PeripheralRef}; 21use embassy_hal_common::{into_ref, PeripheralRef};
21use futures::future::poll_fn;
22use pac::uarte0::RegisterBlock; 22use pac::uarte0::RegisterBlock;
23// Re-export SVD variants to allow user to directly set values. 23// Re-export SVD variants to allow user to directly set values.
24pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity}; 24pub use pac::uarte0::{baudrate::BAUDRATE_A as Baudrate, config::PARITY_A as Parity};
diff --git a/embassy-nrf/src/usb.rs b/embassy-nrf/src/usb.rs
index 688326e9c..0685d419c 100644
--- a/embassy-nrf/src/usb.rs
+++ b/embassy-nrf/src/usb.rs
@@ -1,5 +1,6 @@
1#![macro_use] 1#![macro_use]
2 2
3use core::future::{poll_fn, Future};
3use core::marker::PhantomData; 4use core::marker::PhantomData;
4use core::mem::MaybeUninit; 5use core::mem::MaybeUninit;
5use core::sync::atomic::{compiler_fence, AtomicBool, AtomicU32, Ordering}; 6use core::sync::atomic::{compiler_fence, AtomicBool, AtomicU32, Ordering};
@@ -11,8 +12,6 @@ use embassy_sync::waitqueue::AtomicWaker;
11pub use embassy_usb; 12pub use embassy_usb;
12use embassy_usb::driver::{self, EndpointError, Event, Unsupported}; 13use embassy_usb::driver::{self, EndpointError, Event, Unsupported};
13use embassy_usb::types::{EndpointAddress, EndpointInfo, EndpointType, UsbDirection}; 14use embassy_usb::types::{EndpointAddress, EndpointInfo, EndpointType, UsbDirection};
14use futures::future::poll_fn;
15use futures::Future;
16use pac::usbd::RegisterBlock; 15use pac::usbd::RegisterBlock;
17 16
18use crate::interrupt::{Interrupt, InterruptExt}; 17use crate::interrupt::{Interrupt, InterruptExt};