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

Merge pull request #8235 from elpekenin/fix/stm32-cache-skip

Browse Source 
Redo of #8228
This commit is contained in:
Scott Shawcroft 2023-08-01 10:16:24 -07:00 committed by GitHub
commit cfbfd53b00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/stm/supervisor/internal_flash.c
View File

@ -303,9 +303,8 @@ mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t n
flash_get_sector_info(src, &sector_start_addr, &sector_size); flash_get_sector_info(src, &sector_start_addr, &sector_size);
// Count how many blocks are left in the sector // Count how many blocks are left in the sector
uint32_t count = (sector_size - (src - sector_start_addr)) / FILESYSTEM_BLOCK_SIZE; uint32_t count = (sector_size - (src - sector_start_addr)) / FILESYSTEM_BLOCK_SIZE;
count = MIN(num_blocks, count);
if (count < num_blocks && _cache_flash_addr == sector_start_addr) { if (count <= num_blocks && _cache_flash_addr == sector_start_addr) {
// Read is contained in the cache, so just read cache // Read is contained in the cache, so just read cache
memcpy(dest, (_flash_cache + (src - sector_start_addr)), FILESYSTEM_BLOCK_SIZE * num_blocks); memcpy(dest, (_flash_cache + (src - sector_start_addr)), FILESYSTEM_BLOCK_SIZE * num_blocks);
} else { } else {