From 35d8edbc4104be16d1b1437b32a135a411b2d0e1 Mon Sep 17 00:00:00 2001 From: Rasmus Melchior Jacobsen Date: Fri, 26 May 2023 00:31:41 +0200 Subject: [PATCH] nightly guard async traits only --- embassy-stm32/src/flash/asynch.rs | 12 ++++++++---- embassy-stm32/src/flash/f4.rs | 11 +---------- embassy-stm32/src/flash/mod.rs | 4 ++-- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/embassy-stm32/src/flash/asynch.rs b/embassy-stm32/src/flash/asynch.rs index 6ad1e90d4..a0d994956 100644 --- a/embassy-stm32/src/flash/asynch.rs +++ b/embassy-stm32/src/flash/asynch.rs @@ -9,7 +9,7 @@ use embassy_sync::mutex::Mutex; use super::{ blocking_read, ensure_sector_aligned, family, get_sector, Async, Error, Flash, FlashLayout, FLASH_BASE, FLASH_SIZE, - MAX_ERASE_SIZE, READ_SIZE, WRITE_SIZE, + WRITE_SIZE, }; use crate::peripherals::FLASH; use crate::{interrupt, Peripheral}; @@ -56,8 +56,9 @@ impl interrupt::Handler for InterruptHandler { } } +#[cfg(feature = "nightly")] impl embedded_storage_async::nor_flash::ReadNorFlash for Flash<'_, Async> { - const READ_SIZE: usize = READ_SIZE; + const READ_SIZE: usize = super::READ_SIZE; async fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error> { self.read(offset, bytes) @@ -68,9 +69,10 @@ impl embedded_storage_async::nor_flash::ReadNorFlash for Flash<'_, Async> { } } +#[cfg(feature = "nightly")] impl embedded_storage_async::nor_flash::NorFlash for Flash<'_, Async> { const WRITE_SIZE: usize = WRITE_SIZE; - const ERASE_SIZE: usize = MAX_ERASE_SIZE; + const ERASE_SIZE: usize = super::MAX_ERASE_SIZE; async fn write(&mut self, offset: u32, bytes: &[u8]) -> Result<(), Self::Error> { self.write(offset, bytes).await @@ -157,8 +159,9 @@ foreach_flash_region! { } } + #[cfg(feature = "nightly")] impl embedded_storage_async::nor_flash::ReadNorFlash for crate::_generated::flash_regions::$type_name<'_, Async> { - const READ_SIZE: usize = READ_SIZE; + const READ_SIZE: usize = super::READ_SIZE; async fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error> { self.read(offset, bytes).await @@ -169,6 +172,7 @@ foreach_flash_region! { } } + #[cfg(feature = "nightly")] impl embedded_storage_async::nor_flash::NorFlash for crate::_generated::flash_regions::$type_name<'_, Async> { const WRITE_SIZE: usize = $write_size; const ERASE_SIZE: usize = $erase_size; diff --git a/embassy-stm32/src/flash/f4.rs b/embassy-stm32/src/flash/f4.rs index 35548a558..dd7a04aa2 100644 --- a/embassy-stm32/src/flash/f4.rs +++ b/embassy-stm32/src/flash/f4.rs @@ -3,7 +3,6 @@ use core::ptr::write_volatile; use core::sync::atomic::{fence, Ordering}; use atomic_polyfill::AtomicBool; -#[cfg(feature = "nightly")] use embassy_sync::waitqueue::AtomicWaker; use pac::flash::regs::Sr; use pac::FLASH_SIZE; @@ -20,7 +19,7 @@ mod alt_regions { use stm32_metapac::FLASH_SIZE; use crate::_generated::flash_regions::{OTPRegion, BANK1_REGION1, BANK1_REGION2, BANK1_REGION3, OTP_REGION}; - #[cfg(feature = "nightly")] + use crate::flash::asynch; use crate::flash::{Async, Bank1Region1, Bank1Region2, Blocking, Error, Flash, FlashBank, FlashRegion}; use crate::peripherals::FLASH; @@ -114,7 +113,6 @@ mod alt_regions { } } - #[cfg(feature = "nightly")] impl $type_name<'_, Async> { pub async fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Error> { self.blocking_read(offset, bytes) @@ -185,7 +183,6 @@ mod alt_regions { #[cfg(any(stm32f427, stm32f429, stm32f437, stm32f439, stm32f469, stm32f479))] pub use alt_regions::*; -#[cfg(feature = "nightly")] static WAKER: AtomicWaker = AtomicWaker::new(); static DATA_CACHE_WAS_ENABLED: AtomicBool = AtomicBool::new(false); @@ -236,7 +233,6 @@ pub const fn get_flash_regions() -> &'static [&'static FlashRegion] { &FLASH_REGIONS } -#[cfg(feature = "nightly")] pub(crate) unsafe fn on_interrupt() { // Clear IRQ flags pac::FLASH.sr().write(|w| { @@ -256,7 +252,6 @@ pub(crate) unsafe fn unlock() { pac::FLASH.keyr().write(|w| w.set_key(0xCDEF89AB)); } -#[cfg(feature = "nightly")] pub(crate) unsafe fn enable_write() { assert_eq!(0, WRITE_SIZE % 4); save_data_cache_state(); @@ -269,7 +264,6 @@ pub(crate) unsafe fn enable_write() { }); } -#[cfg(feature = "nightly")] pub(crate) unsafe fn disable_write() { pac::FLASH.cr().write(|w| { w.set_pg(false); @@ -294,7 +288,6 @@ pub(crate) unsafe fn disable_blocking_write() { restore_data_cache_state(); } -#[cfg(feature = "nightly")] pub(crate) async unsafe fn write(start_address: u32, buf: &[u8; WRITE_SIZE]) -> Result<(), Error> { write_start(start_address, buf); wait_ready().await @@ -316,7 +309,6 @@ unsafe fn write_start(start_address: u32, buf: &[u8; WRITE_SIZE]) { } } -#[cfg(feature = "nightly")] pub(crate) async unsafe fn erase_sector(sector: &FlashSector) -> Result<(), Error> { save_data_cache_state(); @@ -372,7 +364,6 @@ pub(crate) unsafe fn clear_all_err() { }); } -#[cfg(feature = "nightly")] pub(crate) async unsafe fn wait_ready() -> Result<(), Error> { use core::task::Poll; diff --git a/embassy-stm32/src/flash/mod.rs b/embassy-stm32/src/flash/mod.rs index 2cc92f518..f44ef2c16 100644 --- a/embassy-stm32/src/flash/mod.rs +++ b/embassy-stm32/src/flash/mod.rs @@ -1,11 +1,11 @@ use embedded_storage::nor_flash::{NorFlashError, NorFlashErrorKind}; -#[cfg(all(feature = "nightly", flash_f4))] +#[cfg(flash_f4)] mod asynch; #[cfg(flash)] mod common; -#[cfg(all(feature = "nightly", flash_f4))] +#[cfg(flash_f4)] pub use asynch::InterruptHandler; #[cfg(flash)] pub use common::*;