Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / stmf0 / ao_storage_stm.c

diff --git a/src/stmf0/ao_storage_stm.c b/src/stmf0/ao_storage_stm.c
index 111db04a12a4cf21893c99d2adae5af252831877..4f5a12ef01d757a12c4e290bcb52c522c20d8438 100644 (file)
--- a/src/stmf0/ao_storage_stm.c
+++ b/src/stmf0/ao_storage_stm.c
@@ -128,24 +128,9 @@ _ao_flash_write(uint32_t pos, void *sv, uint16_t len)
        stm_flash.cr &= ~(1 << STM_FLASH_CR_PG);
 }
 
-static bool
-ao_storage_is_erased(uint32_t pos)
-{
-       uint16_t *flash = _ao_flash_addr(pos);
-       uint32_t i = ao_storage_block >> 1;
-
-       while (i--)
-               if (*flash++ != 0xffff)
-                       return false;
-       return true;
-}
-
 uint8_t
-ao_storage_erase(uint32_t pos)
+ao_storage_device_erase(uint32_t pos)
 {
-       if (ao_storage_is_erased(pos))
-               return 1;
-
        ao_arch_block_interrupts();
        ao_flash_unlock();
 
@@ -197,8 +182,8 @@ ao_storage_setup(void)
 void
 ao_storage_device_info(void) 
 {
-       printf ("Using internal flash, page %d bytes, total %d bytes\n",
-               ao_storage_block, ao_storage_total);
+       printf ("Using internal flash, page %ld bytes, total %ld bytes\n",
+               (long) ao_storage_block, (long) ao_storage_total);
 }
 
 void