X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_flash_stm.c;h=c1648421cd61727f65bd0581aaac2e5d2fb7174b;hb=a487d2fcba57141f6b083d5612c76bac5ad1ac7c;hp=b4d47024b0a1870a7cb8ca2ea2037cbcc240022d;hpb=ac6b4fca0970faa0a537a813242585693b839469;p=fw%2Faltos

diff --git a/src/stm/ao_flash_stm.c b/src/stm/ao_flash_stm.c
index b4d47024..c1648421 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
@@ -16,7 +17,7 @@
  */
 
 #include <ao.h>
-#include <ao_flash_stm.h>
+#include <ao_flash.h>
 
 static uint8_t
 ao_flash_pecr_is_locked(void)
@@ -69,7 +70,7 @@ 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);
@@ -83,15 +84,17 @@ _ao_flash_erase_page(uint32_t *page)
 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;
@@ -116,6 +119,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 +129,5 @@ ao_flash_page(uint32_t *page, uint32_t *src)
 		src += 32;
 	}
 	ao_flash_lock();
+	ao_arch_release_interrupts();
 }