aboutsummaryrefslogtreecommitdiff
path: root/embassy-stm32/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-stm32/src
parent897b72c872183221e088611aa6f30989800afd2b (diff)
Replace futures::future::poll_fn -> core::future::poll_fn.
Diffstat (limited to 'embassy-stm32/src')
-rw-r--r--embassy-stm32/src/dcmi.rs2
-rw-r--r--embassy-stm32/src/i2c/v2.rs2
-rw-r--r--embassy-stm32/src/rng.rs2
-rw-r--r--embassy-stm32/src/sdmmc/mod.rs2
-rw-r--r--embassy-stm32/src/usart/buffered.rs3
-rw-r--r--embassy-stm32/src/usb/usb.rs3
6 files changed, 6 insertions, 8 deletions
diff --git a/embassy-stm32/src/dcmi.rs b/embassy-stm32/src/dcmi.rs
index fb9dc9d08..ff9157d51 100644
--- a/embassy-stm32/src/dcmi.rs
+++ b/embassy-stm32/src/dcmi.rs
@@ -1,8 +1,8 @@
1use core::future::poll_fn;
1use core::task::Poll; 2use core::task::Poll;
2 3
3use embassy_hal_common::{into_ref, PeripheralRef}; 4use embassy_hal_common::{into_ref, PeripheralRef};
4use embassy_sync::waitqueue::AtomicWaker; 5use embassy_sync::waitqueue::AtomicWaker;
5use futures::future::poll_fn;
6 6
7use crate::gpio::sealed::AFType; 7use crate::gpio::sealed::AFType;
8use crate::gpio::Speed; 8use crate::gpio::Speed;
diff --git a/embassy-stm32/src/i2c/v2.rs b/embassy-stm32/src/i2c/v2.rs
index db4924461..b7c89931c 100644
--- a/embassy-stm32/src/i2c/v2.rs
+++ b/embassy-stm32/src/i2c/v2.rs
@@ -1,4 +1,5 @@
1use core::cmp; 1use core::cmp;
2use core::future::poll_fn;
2use core::task::Poll; 3use core::task::Poll;
3 4
4use atomic_polyfill::{AtomicUsize, Ordering}; 5use atomic_polyfill::{AtomicUsize, Ordering};
@@ -6,7 +7,6 @@ use embassy_embedded_hal::SetConfig;
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::dma::NoDma; 11use crate::dma::NoDma;
12use crate::gpio::sealed::AFType; 12use crate::gpio::sealed::AFType;
diff --git a/embassy-stm32/src/rng.rs b/embassy-stm32/src/rng.rs
index 520f2ab9a..10fc4a75e 100644
--- a/embassy-stm32/src/rng.rs
+++ b/embassy-stm32/src/rng.rs
@@ -1,10 +1,10 @@
1#![macro_use] 1#![macro_use]
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;
8use rand_core::{CryptoRng, RngCore}; 8use rand_core::{CryptoRng, RngCore};
9 9
10use crate::{pac, peripherals, Peripheral}; 10use crate::{pac, peripherals, Peripheral};
diff --git a/embassy-stm32/src/sdmmc/mod.rs b/embassy-stm32/src/sdmmc/mod.rs
index 67758c492..a8bc6385f 100644
--- a/embassy-stm32/src/sdmmc/mod.rs
+++ b/embassy-stm32/src/sdmmc/mod.rs
@@ -1,12 +1,12 @@
1#![macro_use] 1#![macro_use]
2 2
3use core::default::Default; 3use core::default::Default;
4use core::future::poll_fn;
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;
10use sdio_host::{BusWidth, CardCapacity, CardStatus, CurrentState, SDStatus, CID, CSD, OCR, SCR}; 10use sdio_host::{BusWidth, CardCapacity, CardStatus, CurrentState, SDStatus, CID, CSD, OCR, SCR};
11 11
12use crate::dma::NoDma; 12use crate::dma::NoDma;
diff --git a/embassy-stm32/src/usart/buffered.rs b/embassy-stm32/src/usart/buffered.rs
index 5f6dabb3b..46c49a997 100644
--- a/embassy-stm32/src/usart/buffered.rs
+++ b/embassy-stm32/src/usart/buffered.rs
@@ -1,11 +1,10 @@
1use core::future::Future; 1use core::future::{poll_fn, Future};
2use core::task::Poll; 2use core::task::Poll;
3 3
4use atomic_polyfill::{compiler_fence, Ordering}; 4use atomic_polyfill::{compiler_fence, Ordering};
5use embassy_cortex_m::peripheral::{PeripheralMutex, PeripheralState, StateStorage}; 5use embassy_cortex_m::peripheral::{PeripheralMutex, PeripheralState, StateStorage};
6use embassy_hal_common::ring_buffer::RingBuffer; 6use embassy_hal_common::ring_buffer::RingBuffer;
7use embassy_sync::waitqueue::WakerRegistration; 7use embassy_sync::waitqueue::WakerRegistration;
8use futures::future::poll_fn;
9 8
10use super::*; 9use super::*;
11 10
diff --git a/embassy-stm32/src/usb/usb.rs b/embassy-stm32/src/usb/usb.rs
index db965824a..e5ee1181c 100644
--- a/embassy-stm32/src/usb/usb.rs
+++ b/embassy-stm32/src/usb/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::sync::atomic::Ordering; 5use core::sync::atomic::Ordering;
5use core::task::Poll; 6use core::task::Poll;
@@ -10,8 +11,6 @@ use embassy_sync::waitqueue::AtomicWaker;
10use embassy_time::{block_for, Duration}; 11use embassy_time::{block_for, Duration};
11use embassy_usb::driver::{self, EndpointAllocError, EndpointError, Event, Unsupported}; 12use embassy_usb::driver::{self, EndpointAllocError, EndpointError, Event, Unsupported};
12use embassy_usb::types::{EndpointAddress, EndpointInfo, EndpointType, UsbDirection}; 13use embassy_usb::types::{EndpointAddress, EndpointInfo, EndpointType, UsbDirection};
13use futures::future::poll_fn;
14use futures::Future;
15use pac::common::{Reg, RW}; 14use pac::common::{Reg, RW};
16use pac::usb::vals::{EpType, Stat}; 15use pac::usb::vals::{EpType, Stat};
17 16