espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-03 17:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[settings-flash] ensure SETTINGS_CONFIG_PAGE_NUM >=2 (#3416)

Browse Source 
This commit adds code to ensure `SETTINGS_CONFIG_PAGE_NUM` is at
least two. This helps simplify the code and also address
Coverity warnings for unreachable code.
This commit is contained in:
Abtin Keshavarzian
2019-02-04 20:46:23 -08:00
committed by Jonathan Hui
parent c31ab99080
commit 29d637683f
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/platforms/utils/settings_flash.c
+8 -11
View File
@@ -97,6 +97,10 @@ struct settingsBlock
#define SETTINGS_CONFIG_PAGE_NUM 2
#endif // SETTINGS_CONFIG_PAGE_NUM
#if (SETTINGS_CONFIG_PAGE_NUM <= 1)
#error "Invalid value for `SETTINGS_CONFIG_PAGE_NUM` (should be >= 2)"
#endif
static uint32_t sSettingsBaseAddress;
static uint32_t sSettingsUsedSize;
@@ -113,8 +117,7 @@ static void setSettingsFlag(uint32_t aBase, uint32_t aFlag)
static void initSettings(uint32_t aBase, uint32_t aFlag)
{
uint32_t address = aBase;
uint32_t settingsSize = SETTINGS_CONFIG_PAGE_NUM > 1 ? SETTINGS_CONFIG_PAGE_SIZE * SETTINGS_CONFIG_PAGE_NUM / 2
: SETTINGS_CONFIG_PAGE_SIZE;
uint32_t settingsSize = SETTINGS_CONFIG_PAGE_SIZE * SETTINGS_CONFIG_PAGE_NUM / 2;
while (address < (aBase + settingsSize))
{
@@ -133,10 +136,7 @@ static uint32_t swapSettingsBlock(otInstance *aInstance)
uint32_t oldBase = sSettingsBaseAddress;
uint32_t swapAddress = oldBase;
uint32_t usedSize = sSettingsUsedSize;
uint8_t pageNum = SETTINGS_CONFIG_PAGE_NUM;
uint32_t settingsSize = pageNum > 1 ? SETTINGS_CONFIG_PAGE_SIZE * pageNum / 2 : SETTINGS_CONFIG_PAGE_SIZE;
otEXPECT(pageNum > 1);
uint32_t settingsSize = SETTINGS_CONFIG_PAGE_SIZE * SETTINGS_CONFIG_PAGE_NUM / 2;
sSettingsBaseAddress =
(swapAddress == SETTINGS_CONFIG_BASE_ADDRESS) ? (swapAddress + settingsSize) : SETTINGS_CONFIG_BASE_ADDRESS;
@@ -198,7 +198,6 @@ static uint32_t swapSettingsBlock(otInstance *aInstance)
setSettingsFlag(sSettingsBaseAddress, (uint32_t)OT_SETTINGS_IN_USE);
setSettingsFlag(oldBase, (uint32_t)OT_SETTINGS_NOT_USED);
exit:
return settingsSize - sSettingsUsedSize;
}
@@ -215,8 +214,7 @@ static otError addSetting(otInstance * aInstance,
struct settingsBlock block;
uint8_t data[OT_SETTINGS_BLOCK_DATA_SIZE];
} OT_TOOL_PACKED_END addBlock;
uint32_t settingsSize = SETTINGS_CONFIG_PAGE_NUM > 1 ? SETTINGS_CONFIG_PAGE_SIZE * SETTINGS_CONFIG_PAGE_NUM / 2
: SETTINGS_CONFIG_PAGE_SIZE;
uint32_t settingsSize = SETTINGS_CONFIG_PAGE_SIZE * SETTINGS_CONFIG_PAGE_NUM / 2;
addBlock.block.flag = 0xff;
addBlock.block.key = aKey;
@@ -260,8 +258,7 @@ void otPlatSettingsInit(otInstance *aInstance)
OT_UNUSED_VARIABLE(aInstance);
uint8_t index;
uint32_t settingsSize = SETTINGS_CONFIG_PAGE_NUM > 1 ? SETTINGS_CONFIG_PAGE_SIZE * SETTINGS_CONFIG_PAGE_NUM / 2
: SETTINGS_CONFIG_PAGE_SIZE;
uint32_t settingsSize = SETTINGS_CONFIG_PAGE_SIZE * SETTINGS_CONFIG_PAGE_NUM / 2;
sSettingsBaseAddress = SETTINGS_CONFIG_BASE_ADDRESS;