From 9115431d358628f2d0ff9f9b5d017e2f3b23472b Mon Sep 17 00:00:00 2001 From: Rasmus Melchior Jacobsen Date: Fri, 26 May 2023 00:12:22 +0200 Subject: [PATCH] Move nightly guard and clear data cache reset bit --- embassy-stm32/src/flash/f4.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/embassy-stm32/src/flash/f4.rs b/embassy-stm32/src/flash/f4.rs index a9ebaa35..35548a55 100644 --- a/embassy-stm32/src/flash/f4.rs +++ b/embassy-stm32/src/flash/f4.rs @@ -236,6 +236,7 @@ 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| { @@ -243,7 +244,6 @@ pub(crate) unsafe fn on_interrupt() { w.set_eop(true); }); - #[cfg(feature = "nightly")] WAKER.wake(); } @@ -436,6 +436,7 @@ fn restore_data_cache_state() { unsafe { // Reset data cache before we enable it again pac::FLASH.acr().modify(|w| w.set_dcrst(true)); + pac::FLASH.acr().modify(|w| w.set_dcrst(false)); pac::FLASH.acr().modify(|w| w.set_dcen(true)) }; }