diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-01-06 15:37:31 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2025-01-06 15:40:05 +0100 |
| commit | 7f05c1e43904081f16cdf7e3f7df99fc9d7f3fee (patch) | |
| tree | c79c6dadaf71e035ef98d4e1eccd944139294c16 /embassy-stm32/src/flash | |
| parent | 7dfb6f7113ef65340f30707b5d358153316c2ba7 (diff) | |
Update stm32-metapac.
Diffstat (limited to 'embassy-stm32/src/flash')
| -rw-r--r-- | embassy-stm32/src/flash/common.rs | 2 | ||||
| -rw-r--r-- | embassy-stm32/src/flash/f4.rs | 4 | ||||
| -rw-r--r-- | embassy-stm32/src/flash/mod.rs | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/embassy-stm32/src/flash/common.rs b/embassy-stm32/src/flash/common.rs index 8ec4bb2a1..0004a7488 100644 --- a/embassy-stm32/src/flash/common.rs +++ b/embassy-stm32/src/flash/common.rs | |||
| @@ -3,12 +3,12 @@ use core::sync::atomic::{fence, Ordering}; | |||
| 3 | 3 | ||
| 4 | use embassy_hal_internal::drop::OnDrop; | 4 | use embassy_hal_internal::drop::OnDrop; |
| 5 | use embassy_hal_internal::{into_ref, PeripheralRef}; | 5 | use embassy_hal_internal::{into_ref, PeripheralRef}; |
| 6 | use stm32_metapac::FLASH_BASE; | ||
| 7 | 6 | ||
| 8 | use super::{ | 7 | use super::{ |
| 9 | family, Async, Blocking, Error, FlashBank, FlashLayout, FlashRegion, FlashSector, FLASH_SIZE, MAX_ERASE_SIZE, | 8 | family, Async, Blocking, Error, FlashBank, FlashLayout, FlashRegion, FlashSector, FLASH_SIZE, MAX_ERASE_SIZE, |
| 10 | READ_SIZE, WRITE_SIZE, | 9 | READ_SIZE, WRITE_SIZE, |
| 11 | }; | 10 | }; |
| 11 | use crate::_generated::FLASH_BASE; | ||
| 12 | use crate::peripherals::FLASH; | 12 | use crate::peripherals::FLASH; |
| 13 | use crate::Peripheral; | 13 | use crate::Peripheral; |
| 14 | 14 | ||
diff --git a/embassy-stm32/src/flash/f4.rs b/embassy-stm32/src/flash/f4.rs index 8ebeae95b..d818c77d0 100644 --- a/embassy-stm32/src/flash/f4.rs +++ b/embassy-stm32/src/flash/f4.rs | |||
| @@ -3,9 +3,9 @@ use core::sync::atomic::{fence, AtomicBool, Ordering}; | |||
| 3 | 3 | ||
| 4 | use embassy_sync::waitqueue::AtomicWaker; | 4 | use embassy_sync::waitqueue::AtomicWaker; |
| 5 | use pac::flash::regs::Sr; | 5 | use pac::flash::regs::Sr; |
| 6 | use pac::FLASH_SIZE; | ||
| 7 | 6 | ||
| 8 | use super::{FlashBank, FlashRegion, FlashSector, FLASH_REGIONS, WRITE_SIZE}; | 7 | use super::{FlashBank, FlashRegion, FlashSector, FLASH_REGIONS, WRITE_SIZE}; |
| 8 | use crate::_generated::FLASH_SIZE; | ||
| 9 | use crate::flash::Error; | 9 | use crate::flash::Error; |
| 10 | use crate::pac; | 10 | use crate::pac; |
| 11 | #[allow(missing_docs)] // TODO | 11 | #[allow(missing_docs)] // TODO |
| @@ -14,9 +14,9 @@ mod alt_regions { | |||
| 14 | use core::marker::PhantomData; | 14 | use core::marker::PhantomData; |
| 15 | 15 | ||
| 16 | use embassy_hal_internal::PeripheralRef; | 16 | use embassy_hal_internal::PeripheralRef; |
| 17 | use stm32_metapac::FLASH_SIZE; | ||
| 18 | 17 | ||
| 19 | use crate::_generated::flash_regions::{BANK1_REGION1, BANK1_REGION2, BANK1_REGION3}; | 18 | use crate::_generated::flash_regions::{BANK1_REGION1, BANK1_REGION2, BANK1_REGION3}; |
| 19 | use crate::_generated::FLASH_SIZE; | ||
| 20 | use crate::flash::{asynch, Async, Bank1Region1, Bank1Region2, Blocking, Error, Flash, FlashBank, FlashRegion}; | 20 | use crate::flash::{asynch, Async, Bank1Region1, Bank1Region2, Blocking, Error, Flash, FlashBank, FlashRegion}; |
| 21 | use crate::peripherals::FLASH; | 21 | use crate::peripherals::FLASH; |
| 22 | 22 | ||
diff --git a/embassy-stm32/src/flash/mod.rs b/embassy-stm32/src/flash/mod.rs index aef1f1482..b564de093 100644 --- a/embassy-stm32/src/flash/mod.rs +++ b/embassy-stm32/src/flash/mod.rs | |||
| @@ -12,8 +12,7 @@ pub use asynch::InterruptHandler; | |||
| 12 | pub use common::*; | 12 | pub use common::*; |
| 13 | 13 | ||
| 14 | pub use crate::_generated::flash_regions::*; | 14 | pub use crate::_generated::flash_regions::*; |
| 15 | pub use crate::_generated::MAX_ERASE_SIZE; | 15 | pub use crate::_generated::{FLASH_BASE, FLASH_SIZE, MAX_ERASE_SIZE, WRITE_SIZE}; |
| 16 | pub use crate::pac::{FLASH_BASE, FLASH_SIZE, WRITE_SIZE}; | ||
| 17 | 16 | ||
| 18 | /// Get whether the default flash layout is being used. | 17 | /// Get whether the default flash layout is being used. |
| 19 | /// | 18 | /// |
