djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm: add timer to storage cache so it can be flushed.

Browse Source
This commit is contained in:
Damien 2013-12-11 00:38:40 +00:00
parent 318aec6ba9
commit ec643130d0
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stm/storage.c
View File

@ -2,6 +2,7 @@
#include "std.h" #include "std.h"
#include "misc.h" #include "misc.h"
#include "systick.h"
#include "led.h" #include "led.h"
#include "flash.h" #include "flash.h"
#include "storage.h" #include "storage.h"
@ -17,6 +18,7 @@ static uint32_t cache_flash_sector_id;
static uint32_t cache_flash_sector_start; static uint32_t cache_flash_sector_start;
static uint32_t cache_flash_sector_size; static uint32_t cache_flash_sector_size;
static bool cache_dirty; static bool cache_dirty;
static uint32_t sys_tick_counter_last_write;
static void cache_flush(void) { static void cache_flush(void) {
if (cache_dirty) { if (cache_dirty) {
@ -50,6 +52,7 @@ void storage_init(void) {
cache_flash_sector_id = 0; cache_flash_sector_id = 0;
cache_dirty = false; cache_dirty = false;
is_initialised = true; is_initialised = true;
sys_tick_counter_last_write = 0;
} }
} }
@ -61,6 +64,11 @@ uint32_t storage_get_block_count(void) {
return FLASH_PART1_START_BLOCK + FLASH_PART1_NUM_BLOCKS; return FLASH_PART1_START_BLOCK + FLASH_PART1_NUM_BLOCKS;
} }
bool storage_needs_flush(void) {
// wait 2 seconds after last write to flush
return cache_dirty && sys_tick_has_passed(sys_tick_counter_last_write, 2000);
}
void storage_flush(void) { void storage_flush(void) {
cache_flush(); cache_flush();
} }
@ -143,6 +151,7 @@ bool storage_write_block(const uint8_t *src, uint32_t block) {
uint32_t flash_addr = FLASH_MEM_START_ADDR + (block - FLASH_PART1_START_BLOCK) * BLOCK_SIZE; uint32_t flash_addr = FLASH_MEM_START_ADDR + (block - FLASH_PART1_START_BLOCK) * BLOCK_SIZE;
uint8_t *dest = cache_get_addr_for_write(flash_addr); uint8_t *dest = cache_get_addr_for_write(flash_addr);
memcpy(dest, src, BLOCK_SIZE); memcpy(dest, src, BLOCK_SIZE);
sys_tick_counter_last_write = sys_tick_counter;
return true; return true;
} else { } else {

1
stm/storage.h
View File

@ -1,6 +1,7 @@
void storage_init(void); void storage_init(void);
uint32_t storage_get_block_size(void); uint32_t storage_get_block_size(void);
uint32_t storage_get_block_count(void); uint32_t storage_get_block_count(void);
bool storage_needs_flush(void);
void storage_flush(void); void storage_flush(void);
bool storage_read_block(uint8_t *dest, uint32_t block); bool storage_read_block(uint8_t *dest, uint32_t block);
bool storage_write_block(const uint8_t *src, uint32_t block); bool storage_write_block(const uint8_t *src, uint32_t block);