Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nvs_flash: Improve nvs_flash_init_partition() speed

Browse source 
Signed-off-by: Sagar Bijwe <sagar@espressif.com>
This commit is contained in:
Gautier Seidel 2018-12-18 17:12:35 +01:00 committed by bot
parent 52b27890de
commit b4c4f8514b
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/nvs_flash/src/nvs_page.cpp
View file

@ -48,19 +48,22 @@ esp_err_t Page::load(uint32_t sectorNumber)
mState = header.mState; mState = header.mState;
// check if the whole page is really empty // check if the whole page is really empty
// reading the whole page takes ~40 times less than erasing it // reading the whole page takes ~40 times less than erasing it
uint32_t line[8]; const int BLOCK_SIZE = 128;
for (uint32_t i = 0; i < SPI_FLASH_SEC_SIZE; i += sizeof(line)) { uint32_t* block = new uint32_t[BLOCK_SIZE];
rc = spi_flash_read(mBaseAddress + i, line, sizeof(line)); for (uint32_t i = 0; i < SPI_FLASH_SEC_SIZE; i += 4 * BLOCK_SIZE) {
rc = spi_flash_read(mBaseAddress + i, block, 4 * BLOCK_SIZE);
if (rc != ESP_OK) { if (rc != ESP_OK) {
mState = PageState::INVALID; mState = PageState::INVALID;
delete[] block;
return rc; return rc;
} }
if (std::any_of(line, line + 4, [](uint32_t val) -> bool { return val != 0xffffffff; })) { if (std::any_of(block, block + BLOCK_SIZE, [](uint32_t val) -> bool { return val != 0xffffffff; })) {
// page isn't as empty after all, mark it as corrupted // page isn't as empty after all, mark it as corrupted
mState = PageState::CORRUPT; mState = PageState::CORRUPT;
break; break;
} }
} }
delete[] block;
} else if (header.mCrc32 != header.calculateCrc32()) { } else if (header.mCrc32 != header.calculateCrc32()) {
header.mState = PageState::CORRUPT; header.mState = PageState::CORRUPT;
} else { } else {