aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchanterheld <[email protected]>2025-01-02 21:14:06 +0100
committerchanterheld <[email protected]>2025-01-02 21:14:06 +0100
commitd36876042410b056d39dbb08a5d3125c103ea170 (patch)
tree9f10075317f00310b52b0c0ea52ca09ef7554c15
parentc706e3797a7fb2408aa6f1cfaeba8a6bb951ce25 (diff)
fix stmd g0/g4 formatting and bker bit access
-rw-r--r--embassy-stm32/src/flash/g.rs7
-rw-r--r--embassy-stm32/src/flash/mod.rs4
2 files changed, 6 insertions, 5 deletions
diff --git a/embassy-stm32/src/flash/g.rs b/embassy-stm32/src/flash/g.rs
index 7d9c7718b..83663743c 100644
--- a/embassy-stm32/src/flash/g.rs
+++ b/embassy-stm32/src/flash/g.rs
@@ -59,6 +59,7 @@ pub(crate) unsafe fn blocking_erase_sector(sector: &FlashSector) -> Result<(), E
59 interrupt::free(|_| { 59 interrupt::free(|_| {
60 pac::FLASH.cr().modify(|w| { 60 pac::FLASH.cr().modify(|w| {
61 w.set_per(true); 61 w.set_per(true);
62 #[cfg(any(flash_g0x0, flash_g0x1, flash_g4c3))]
62 w.set_bker(sector.bank == crate::flash::FlashBank::Bank2); 63 w.set_bker(sector.bank == crate::flash::FlashBank::Bank2);
63 #[cfg(flash_g0x0)] 64 #[cfg(flash_g0x0)]
64 w.set_pnb(idx as u16); 65 w.set_pnb(idx as u16);
@@ -100,11 +101,11 @@ pub(crate) unsafe fn clear_all_err() {
100} 101}
101 102
102#[cfg(any(flash_g0x0, flash_g0x1))] 103#[cfg(any(flash_g0x0, flash_g0x1))]
103fn wait_busy(){ 104fn wait_busy() {
104 while pac::FLASH.sr().read().bsy() | pac::FLASH.sr().read().bsy2() {} 105 while pac::FLASH.sr().read().bsy() | pac::FLASH.sr().read().bsy2() {}
105} 106}
106 107
107#[cfg(not(any(flash_g0x0, flash_g0x1)))] 108#[cfg(not(any(flash_g0x0, flash_g0x1)))]
108fn wait_busy(){ 109fn wait_busy() {
109 while pac::FLASH.sr().read().bsy() {} 110 while pac::FLASH.sr().read().bsy() {}
110} \ No newline at end of file 111}
diff --git a/embassy-stm32/src/flash/mod.rs b/embassy-stm32/src/flash/mod.rs
index a7eb3fbcc..aef1f1482 100644
--- a/embassy-stm32/src/flash/mod.rs
+++ b/embassy-stm32/src/flash/mod.rs
@@ -107,8 +107,8 @@ pub enum FlashBank {
107#[cfg_attr( 107#[cfg_attr(
108 not(any( 108 not(any(
109 flash_l0, flash_l1, flash_l4, flash_l5, flash_wl, flash_wb, flash_f0, flash_f1, flash_f2, flash_f3, flash_f4, 109 flash_l0, flash_l1, flash_l4, flash_l5, flash_wl, flash_wb, flash_f0, flash_f1, flash_f2, flash_f3, flash_f4,
110 flash_f7, flash_g0x0, flash_g0x1, flash_g4c2, flash_g4c3, flash_g4c4, flash_h7, flash_h7ab, flash_u5, flash_h50, flash_u0, 110 flash_f7, flash_g0x0, flash_g0x1, flash_g4c2, flash_g4c3, flash_g4c4, flash_h7, flash_h7ab, flash_u5,
111 flash_h5, 111 flash_h50, flash_u0, flash_h5,
112 )), 112 )),
113 path = "other.rs" 113 path = "other.rs"
114)] 114)]