diff options
| author | Rasmus Melchior Jacobsen <[email protected]> | 2023-05-24 13:11:03 +0200 |
|---|---|---|
| committer | Rasmus Melchior Jacobsen <[email protected]> | 2023-05-25 13:04:48 +0200 |
| commit | 966f0abf48cc143fc33e17a5fc9e138cf82ab05f (patch) | |
| tree | 1e544db251e450e16445f152acf7de2541c6728e /embassy-stm32 | |
| parent | 1329a387e060d60ee2833d2eed6393f5dfc84d1a (diff) | |
Run format with nightly
Diffstat (limited to 'embassy-stm32')
| -rw-r--r-- | embassy-stm32/src/flash/common.rs | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/flash/f4.rs | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/embassy-stm32/src/flash/common.rs b/embassy-stm32/src/flash/common.rs index 7cec5a3c9..e1fe7e9da 100644 --- a/embassy-stm32/src/flash/common.rs +++ b/embassy-stm32/src/flash/common.rs | |||
| @@ -8,8 +8,7 @@ use embassy_sync::mutex::Mutex; | |||
| 8 | use stm32_metapac::FLASH_BASE; | 8 | use stm32_metapac::FLASH_BASE; |
| 9 | 9 | ||
| 10 | use super::{ | 10 | use super::{ |
| 11 | family, Error, FlashLayout, FlashRegion, FLASH_SIZE, MAX_ERASE_SIZE, READ_SIZE, | 11 | family, Error, FlashBank, FlashLayout, FlashRegion, FlashSector, FLASH_SIZE, MAX_ERASE_SIZE, READ_SIZE, WRITE_SIZE, |
| 12 | WRITE_SIZE, FlashSector, FlashBank, | ||
| 13 | }; | 12 | }; |
| 14 | use crate::peripherals::FLASH; | 13 | use crate::peripherals::FLASH; |
| 15 | use crate::Peripheral; | 14 | use crate::Peripheral; |
| @@ -162,7 +161,6 @@ pub(crate) fn ensure_sector_aligned( | |||
| 162 | Ok(()) | 161 | Ok(()) |
| 163 | } | 162 | } |
| 164 | 163 | ||
| 165 | |||
| 166 | impl embedded_storage::nor_flash::ErrorType for Flash<'_> { | 164 | impl embedded_storage::nor_flash::ErrorType for Flash<'_> { |
| 167 | type Error = Error; | 165 | type Error = Error; |
| 168 | } | 166 | } |
diff --git a/embassy-stm32/src/flash/f4.rs b/embassy-stm32/src/flash/f4.rs index 0c008fd0d..084bbdc6e 100644 --- a/embassy-stm32/src/flash/f4.rs +++ b/embassy-stm32/src/flash/f4.rs | |||
| @@ -2,26 +2,26 @@ use core::convert::TryInto; | |||
| 2 | use core::ptr::write_volatile; | 2 | use core::ptr::write_volatile; |
| 3 | use core::sync::atomic::{fence, Ordering}; | 3 | use core::sync::atomic::{fence, Ordering}; |
| 4 | 4 | ||
| 5 | #[cfg(feature = "nightly")] | ||
| 6 | use embassy_sync::waitqueue::AtomicWaker; | ||
| 7 | |||
| 5 | use super::{FlashRegion, FlashSector, FLASH_REGIONS, WRITE_SIZE}; | 8 | use super::{FlashRegion, FlashSector, FLASH_REGIONS, WRITE_SIZE}; |
| 6 | use crate::flash::Error; | 9 | use crate::flash::Error; |
| 7 | use crate::pac; | 10 | use crate::pac; |
| 8 | 11 | ||
| 9 | #[cfg(feature = "nightly")] | ||
| 10 | use embassy_sync::waitqueue::AtomicWaker; | ||
| 11 | |||
| 12 | #[cfg(any(stm32f427, stm32f429, stm32f437, stm32f439, stm32f469, stm32f479))] | 12 | #[cfg(any(stm32f427, stm32f429, stm32f437, stm32f439, stm32f469, stm32f479))] |
| 13 | mod alt_regions { | 13 | mod alt_regions { |
| 14 | use embassy_hal_common::PeripheralRef; | 14 | use embassy_hal_common::PeripheralRef; |
| 15 | use stm32_metapac::FLASH_SIZE; | 15 | use stm32_metapac::FLASH_SIZE; |
| 16 | 16 | ||
| 17 | use crate::_generated::flash_regions::{OTPRegion, BANK1_REGION1, BANK1_REGION2, BANK1_REGION3, OTP_REGION}; | 17 | use crate::_generated::flash_regions::{OTPRegion, BANK1_REGION1, BANK1_REGION2, BANK1_REGION3, OTP_REGION}; |
| 18 | #[cfg(feature = "nightly")] | ||
| 19 | use crate::flash::asynch; | ||
| 18 | use crate::flash::{ | 20 | use crate::flash::{ |
| 19 | common, Bank1Region1, Bank1Region2, BlockingFlashRegion, Error, Flash, FlashBank, FlashRegion, | 21 | common, Bank1Region1, Bank1Region2, BlockingFlashRegion, Error, Flash, FlashBank, FlashRegion, READ_SIZE, |
| 20 | READ_SIZE, REGION_ACCESS, | 22 | REGION_ACCESS, |
| 21 | }; | 23 | }; |
| 22 | use crate::peripherals::FLASH; | 24 | use crate::peripherals::FLASH; |
| 23 | #[cfg(feature = "nightly")] | ||
| 24 | use crate::flash::asynch; | ||
| 25 | 25 | ||
| 26 | pub const ALT_BANK1_REGION3: FlashRegion = FlashRegion { | 26 | pub const ALT_BANK1_REGION3: FlashRegion = FlashRegion { |
| 27 | size: 3 * BANK1_REGION3.erase_size, | 27 | size: 3 * BANK1_REGION3.erase_size, |
