altos/telefireone-v1.0: Track ao_led_init API change

[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 38b1c2d8b585c154b8d6a24cfca28cbeaddb0e36..38618bbe53165f64138c0a3a39fa81c2740cbf20 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
@@ -73,22 +74,23 @@ 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(".ramtext"), noinline))
@@ -98,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++;
@@ -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();
 }