altosui: Add config and pyro tabs to graph widget

[fw/altos] / src / stm / ao_flash_stm.c

diff --git a/src/stm/ao_flash_stm.c b/src/stm/ao_flash_stm.c
index 39dc81444a1bb23bc1e48e885b9d594f213094b9..77296c322d2f11906c2f02ae966da7e153b0a54c 100644 (file)
--- 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,15 +70,14 @@ ao_flash_wait_bsy(void)
                ;
 }
 
-static void __attribute__ ((section(".ramtext"),noinline))
+static void __attribute__ ((section(".sdata2.flash"), 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
@@ -93,16 +93,15 @@ ao_flash_erase_page(uint32_t *page)
        ao_arch_release_interrupts();
 }
 
-static void __attribute__ ((section(".ramtext"), noinline))
+static void __attribute__ ((section(".sdata2.flash"), 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++;