X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_flash.c;h=d323926fe209d310c2e27f3382259709664e9752;hp=1201a0e5799821de32bf23af92ee459f6970da5e;hb=8de9d3cbfcd1db7b554fb761296a8de09aafc8c3;hpb=569a1dac55b70c30f01afa7bcb74442ecdd85d85

diff --git a/src/ao_flash.c b/src/ao_flash.c
index 1201a0e5..d323926f 100644
--- a/src/ao_flash.c
+++ b/src/ao_flash.c
@@ -93,12 +93,12 @@ static __pdata uint16_t ao_flash_block = FLASH_BLOCK_NONE;
 static __pdata uint8_t	ao_flash_block_dirty;
 static __pdata uint8_t  ao_flash_write_pending;
 static __pdata uint8_t	ao_flash_setup_done;
-static __data uint8_t	ao_flash_block_shift;
-static __data uint16_t	ao_flash_block_size;
-static __data uint16_t	ao_flash_block_mask;
+static __pdata uint8_t	ao_flash_block_shift;
+static __pdata uint16_t	ao_flash_block_size;
+static __pdata uint16_t	ao_flash_block_mask;
 
 void
-ao_storage_setup(void)
+ao_storage_setup(void) __reentrant
 {
 	uint8_t	status;
 
@@ -289,10 +289,9 @@ ao_storage_flush(void) __reentrant
 uint8_t
 ao_storage_erase(uint32_t pos) __reentrant
 {
-	uint16_t block = (uint16_t) (pos >> ao_flash_block_shift);
-
 	ao_mutex_get(&ao_flash_mutex); {
-		ao_flash_fill(block);
+		ao_flash_flush_internal();
+		ao_flash_block = (uint16_t) (pos >> ao_flash_block_shift);
 		memset(ao_flash_data, 0xff, ao_flash_block_size);
 		ao_flash_block_dirty = 1;
 	} ao_mutex_put(&ao_flash_mutex);