Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-12 22:58:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

hal: flash: use furi_hal_cortex_timer for timeouts

Browse Source
This commit is contained in:
hedger
2023-04-22 21:49:00 +04:00
parent ad0db706c0
commit b0fa913fa2
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
firmware/targets/f7/furi_hal/furi_hal_flash.c
View File

@@ -1,6 +1,7 @@
#include <furi_hal_flash.h> #include <furi_hal_flash.h>
#include <furi_hal_bt.h> #include <furi_hal_bt.h>
#include <furi_hal_power.h> #include <furi_hal_power.h>
#include <furi_hal_cortex.h>
#include <furi.h> #include <furi.h>
#include <ble/ble.h> #include <ble/ble.h>
#include <interface/patterns/ble_thread/shci/shci.h> #include <interface/patterns/ble_thread/shci/shci.h>
@@ -231,17 +232,14 @@ static void furi_hal_flush_cache(void) {
bool furi_hal_flash_wait_last_operation(uint32_t timeout) { bool furi_hal_flash_wait_last_operation(uint32_t timeout) {
uint32_t error = 0; uint32_t error = 0;
uint32_t countdown = 0;
/* Wait for the FLASH operation to complete by polling on BUSY flag to be reset. /* Wait for the FLASH operation to complete by polling on BUSY flag to be reset.
Even if the FLASH operation fails, the BUSY flag will be reset and an error Even if the FLASH operation fails, the BUSY flag will be reset and an error
flag will be set */ flag will be set */
countdown = timeout; FuriHalCortexTimer timer = furi_hal_cortex_timer_get(timeout * 1000);
while(READ_BIT(FLASH->SR, FLASH_SR_BSY)) { while(READ_BIT(FLASH->SR, FLASH_SR_BSY)) {
if(LL_SYSTICK_IsActiveCounterFlag()) { if(furi_hal_cortex_timer_is_expired(timer)) {
countdown--;
}
if(countdown == 0) {
return false; return false;
} }
} }
@@ -264,12 +262,10 @@ bool furi_hal_flash_wait_last_operation(uint32_t timeout) {
CLEAR_BIT(FLASH->SR, error); CLEAR_BIT(FLASH->SR, error);
/* Wait for control register to be written */ /* Wait for control register to be written */
countdown = timeout; timer = furi_hal_cortex_timer_get(timeout * 1000);
while(READ_BIT(FLASH->SR, FLASH_SR_CFGBSY)) { while(READ_BIT(FLASH->SR, FLASH_SR_CFGBSY)) {
if(LL_SYSTICK_IsActiveCounterFlag()) { if(furi_hal_cortex_timer_is_expired(timer)) {
countdown--;
}
if(countdown == 0) {
return false; return false;
} }
} }