X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_flash_stm.c;h=38618bbe53165f64138c0a3a39fa81c2740cbf20;hb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;hp=d7a855827723cbee2ce3bc226e99860bca9ac74d;hpb=4a90eec4b8ee4a35711aa74c13b3f30d12c0fe08;p=fw%2Faltos

diff --git a/src/stm/ao_flash_stm.c b/src/stm/ao_flash_stm.c
index d7a85582..38618bbe 100644
--- a/src/stm/ao_flash_stm.c
+++ b/src/stm/ao_flash_stm.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -69,38 +70,38 @@ ao_flash_wait_bsy(void)
 		;
 }
 
-static void __attribute__ ((section(".text.ram"),noinline))
+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
 ao_flash_erase_page(uint32_t *page)
 {
+	ao_arch_block_interrupts();
 	ao_flash_pecr_unlock();
 	ao_flash_pgr_unlock();
 
 	_ao_flash_erase_page(page);
 
 	ao_flash_lock();
+	ao_arch_release_interrupts();
 }
 
-static void __attribute__ ((section(".text.ram"), noinline))
+static void __attribute__ ((section(".ramtext"), noinline))
 _ao_flash_half_page(uint32_t *dst, uint32_t *src)
 {
 	uint8_t		i;
 
 	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++;
@@ -116,6 +117,8 @@ ao_flash_page(uint32_t *page, uint32_t *src)
 	uint8_t		h;
 
 	ao_flash_erase_page(page);
+
+	ao_arch_block_interrupts();
 	ao_flash_pecr_unlock();
 	ao_flash_pgr_unlock();
 	for (h = 0; h < 2; h++) {
@@ -124,4 +127,5 @@ ao_flash_page(uint32_t *page, uint32_t *src)
 		src += 32;
 	}
 	ao_flash_lock();
+	ao_arch_release_interrupts();
 }