diff options
| author | Rasmus Melchior Jacobsen <[email protected]> | 2023-03-30 04:24:41 +0200 |
|---|---|---|
| committer | Rasmus Melchior Jacobsen <[email protected]> | 2023-03-30 04:24:41 +0200 |
| commit | def576ac4688fb2113aacca46d5bfb4001c8dc1a (patch) | |
| tree | 0476c852a8900c9bfd0cb998b397627f7f62b857 /embassy-stm32/src/flash/mod.rs | |
| parent | ef1890e9110c8ef3553e6a2d0979dfb52520b025 (diff) | |
Remove FlashRegion trait and rename Settings to FlashRegion
Diffstat (limited to 'embassy-stm32/src/flash/mod.rs')
| -rw-r--r-- | embassy-stm32/src/flash/mod.rs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/embassy-stm32/src/flash/mod.rs b/embassy-stm32/src/flash/mod.rs index ec7c66947..1e7d4c657 100644 --- a/embassy-stm32/src/flash/mod.rs +++ b/embassy-stm32/src/flash/mod.rs | |||
| @@ -45,15 +45,11 @@ mod common; | |||
| 45 | #[cfg(flash)] | 45 | #[cfg(flash)] |
| 46 | pub use common::*; | 46 | pub use common::*; |
| 47 | 47 | ||
| 48 | pub trait FlashRegion { | 48 | pub struct FlashRegion { |
| 49 | const SETTINGS: FlashRegionSettings; | 49 | pub base: u32, |
| 50 | } | 50 | pub size: u32, |
| 51 | 51 | pub erase_size: u32, | |
| 52 | pub struct FlashRegionSettings { | 52 | pub write_size: u32, |
| 53 | pub base: usize, | ||
| 54 | pub size: usize, | ||
| 55 | pub erase_size: usize, | ||
| 56 | pub write_size: usize, | ||
| 57 | pub erase_value: u8, | 53 | pub erase_value: u8, |
| 58 | } | 54 | } |
| 59 | 55 | ||
| @@ -64,7 +60,7 @@ pub struct FlashSector { | |||
| 64 | pub size: u32, | 60 | pub size: u32, |
| 65 | } | 61 | } |
| 66 | 62 | ||
| 67 | impl Drop for FlashRegions<'_> { | 63 | impl Drop for FlashLayout<'_> { |
| 68 | fn drop(&mut self) { | 64 | fn drop(&mut self) { |
| 69 | unsafe { family::lock() }; | 65 | unsafe { family::lock() }; |
| 70 | } | 66 | } |
