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

Merge git://github.com/stevie67/micropython into stevie67-master

Browse Source
This commit is contained in:
Damien George 2014-01-04 12:32:42 +00:00
commit cb3b6ce7ae
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stm/storage.c
View File

@ -49,6 +49,16 @@ static uint8_t *cache_get_addr_for_write(uint32_t flash_addr) {
return (uint8_t*)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start; return (uint8_t*)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
} }
static uint8_t *cache_get_addr_for_read(uint32_t flash_addr) {
uint32_t flash_sector_start;
uint32_t flash_sector_size;
uint32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
if (cache_flash_sector_id == flash_sector_id)
return (uint8_t*)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
// not in cache, copy straight from flash
return (uint8_t*)flash_addr;
}
void storage_init(void) { void storage_init(void) {
if (!is_initialised) { if (!is_initialised) {
cache_flash_sector_id = 0; cache_flash_sector_id = 0;
@ -131,8 +141,8 @@ bool storage_read_block(uint8_t *dest, uint32_t block) {
return true; return true;
} else if (FLASH_PART1_START_BLOCK <= block && block < FLASH_PART1_START_BLOCK + FLASH_PART1_NUM_BLOCKS) { } else if (FLASH_PART1_START_BLOCK <= block && block < FLASH_PART1_START_BLOCK + FLASH_PART1_NUM_BLOCKS) {
// non-MBR block, just copy straight from flash uint32_t flash_addr = FLASH_MEM_START_ADDR + (block - FLASH_PART1_START_BLOCK) * BLOCK_SIZE;
uint8_t *src = (uint8_t*)FLASH_MEM_START_ADDR + (block - FLASH_PART1_START_BLOCK) * BLOCK_SIZE; uint8_t *src = cache_get_addr_for_read(flash_addr);
memcpy(dest, src, BLOCK_SIZE); memcpy(dest, src, BLOCK_SIZE);
return true; return true;