Обновление
This commit is contained in:
parent
7fc05c077e
commit
3dea623473
|
|
@ -121,17 +121,17 @@ eStorageStatus xStorageOnFlashFlagchip_Load(tStorageOnFlashFlagchip *env, void *
|
||||||
sInternalFlashPage_Read(env->mainFlashPageAddress, 0x0, data, size);
|
sInternalFlashPage_Read(env->mainFlashPageAddress, 0x0, data, size);
|
||||||
return STORAGE_OK;
|
return STORAGE_OK;
|
||||||
} else {
|
} else {
|
||||||
LoggerInfoStatic(LOGGER, LOG_SIGN, "Data recovery main page ")
|
LoggerInfoStatic(LOGGER, LOG_SIGN, "Data recovery main page (main page <- recovery) ")
|
||||||
sInternalFlashPage_Read(env->recoveryFlashPageAddress, 0x0, data, size);
|
sInternalFlashPage_Read(env->recoveryFlashPageAddress, 0x0, data, size);
|
||||||
return xStorageOnFlashFlagchip_DumpOn(env, recoveryCrcCalc, env->mainFlashPageAddress, data, size);
|
return xStorageOnFlashFlagchip_DumpOn(env, recoveryCrcCalc, env->mainFlashPageAddress, data, size);
|
||||||
}
|
}
|
||||||
} else if (recoveryCrcOk || mainCrcOk) {
|
} else if (recoveryCrcOk || mainCrcOk) {
|
||||||
if (recoveryCrcOk) {
|
if (recoveryCrcOk) {
|
||||||
LoggerInfoStatic(LOGGER, LOG_SIGN, "Data recovery main page")
|
LoggerInfoStatic(LOGGER, LOG_SIGN, "Data recovery main page (main page <- recovery)")
|
||||||
sInternalFlashPage_Read(env->recoveryFlashPageAddress, 0x0, data, size);
|
sInternalFlashPage_Read(env->recoveryFlashPageAddress, 0x0, data, size);
|
||||||
return xStorageOnFlashFlagchip_DumpOn(env, recoveryCrcCalc, env->mainFlashPageAddress, data, size);
|
return xStorageOnFlashFlagchip_DumpOn(env, recoveryCrcCalc, env->mainFlashPageAddress, data, size);
|
||||||
} else {
|
} else {
|
||||||
LoggerInfoStatic(LOGGER, LOG_SIGN, "Data recovery recovery page")
|
LoggerInfoStatic(LOGGER, LOG_SIGN, "Data recovery recovery page (main page -> recovery)")
|
||||||
sInternalFlashPage_Read(env->mainFlashPageAddress, 0x0, data, size);
|
sInternalFlashPage_Read(env->mainFlashPageAddress, 0x0, data, size);
|
||||||
return xStorageOnFlashFlagchip_DumpOn(env, mainCrcCalc, env->recoveryFlashPageAddress, data, size);
|
return xStorageOnFlashFlagchip_DumpOn(env, mainCrcCalc, env->recoveryFlashPageAddress, data, size);
|
||||||
}
|
}
|
||||||
|
|
@ -152,6 +152,6 @@ tStorageInterface xStorageOnFlashFlagchip_GetInterface(tStorageOnFlashFlagchip *
|
||||||
return (tStorageInterface) {
|
return (tStorageInterface) {
|
||||||
.env = env,
|
.env = env,
|
||||||
.load = (StorageIOTransaction) xStorageOnFlashFlagchip_Load,
|
.load = (StorageIOTransaction) xStorageOnFlashFlagchip_Load,
|
||||||
.dump = (StorageIOTransaction) xStorageOnFlashFlagchip_Dump,
|
.dump = (StorageIOTransaction) xStorageOnFlashFlagchip_Dump
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue