altos/stm: Add nvic priority register fields. Add more TIM234 defines.

[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 d7a855827723cbee2ce3bc226e99860bca9ac74d..c1648421cd61727f65bd0581aaac2e5d2fb7174b 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,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();
 }