From: Keith Packard <keithp@keithp.com>
Date: Sun, 2 Apr 2017 22:56:17 +0000 (-0700)
Subject: stm: Use common flash wait loop instead of inlining
X-Git-Tag: 1.7~69
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=3ce663875d69739cc2d43fcd88b22820cd9d6500;p=fw%2Faltos

stm: Use common flash wait loop instead of inlining

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/stm/ao_flash_stm.c b/src/stm/ao_flash_stm.c
index c1648421..38618bbe 100644
--- a/src/stm/ao_flash_stm.c
+++ b/src/stm/ao_flash_stm.c
@@ -74,11 +74,10 @@ static void __attribute__ ((section(".ramtext"),noinline))
 _ao_flash_erase_page(uint32_t *page)
 {
 	stm_flash.pecr |= (1 << STM_FLASH_PECR_ERASE) | (1 << STM_FLASH_PECR_PROG);
-	
+
 	*page = 0x00000000;
 
-	while (stm_flash.sr & (1 << STM_FLASH_SR_BSY))
-		;
+	ao_flash_wait_bsy();
 }
 
 void
@@ -101,9 +100,8 @@ _ao_flash_half_page(uint32_t *dst, uint32_t *src)
 
 	stm_flash.pecr |= (1 << STM_FLASH_PECR_FPRG);
 	stm_flash.pecr |= (1 << STM_FLASH_PECR_PROG);
-	
-	while (stm_flash.sr & (1 << STM_FLASH_SR_BSY))
-		;
+
+	ao_flash_wait_bsy();
 
 	for (i = 0; i < 32; i++) {
 		*dst++ = *src++;