andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flash_main: more checks when loading config from MFS 

Signed-off-by: Andrey Gusakov <dron0gus@gmail.com>
This commit is contained in:
Andrey Gusakov 2023-05-08 14:03:38 +03:00 committed by rusefillc
parent 6c3886e591
commit 0c41a02124
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/controllers/flash_main.cpp
View File

@ -260,11 +260,27 @@ static FlashState readConfiguration() {
mfs_error_t err = mfsReadRecord(&mfsd, EFI_MFS_SETTINGS_RECORD_ID, mfs_error_t err = mfsReadRecord(&mfsd, EFI_MFS_SETTINGS_RECORD_ID,
&settings_size, (uint8_t *)&persistentState); &settings_size, (uint8_t *)&persistentState);
// TODO: check err result better?
if (err == MFS_NO_ERROR) { if (err == MFS_NO_ERROR) {
// readed size is not exactly the same
if (settings_size != sizeof(persistentState))
return FlashState::IncompatibleVersion;
// claimed size or versio is not the same
if (persistentState.version != FLASH_DATA_VERSION || persistentState.size != sizeof(persistentState))
return FlashState::IncompatibleVersion;
// now crc
auto flashCrc = flashStateCrc(persistentState);
if (flashCrc != persistentState.value) {
// If the stored crc is all 1s, that probably means the flash is actually blank, not that the crc failed.
if (persistentState.value == ((decltype(persistentState.value))-1)) {
return FlashState::BlankChip;
} else {
return FlashState::CrcFailed;
}
}
return FlashState::Ok; return FlashState::Ok;
} else { } else {
// TODO: is this correct?
return FlashState::BlankChip; return FlashState::BlankChip;
} }
#endif #endif