Remove private code_utils.hpp include from examples. (#1534)

This commit is contained in:
Jonathan Hui
2017-04-04 08:46:54 -07:00
committed by GitHub
parent c187c1ff81
commit 5e34eee014
23 changed files with 258 additions and 166 deletions
+4 -4
View File
@@ -42,7 +42,7 @@
#include "openthread/types.h"
#include "openthread/platform/settings.h"
#include <common/code_utils.hpp>
#include <utils/code_utils.h>
#include "flash.h"
@@ -149,7 +149,7 @@ static uint32_t swapSettingsBlock(otInstance *aInstance)
(void)aInstance;
VerifyOrExit(pageNum > 1, ;);
otEXPECT(pageNum > 1);
sSettingsBaseAddress = (swapAddress == SETTINGS_CONFIG_BASE_ADDRESS) ?
(swapAddress + settingsSize) :
@@ -244,8 +244,8 @@ static ThreadError addSetting(otInstance *aInstance, uint16_t aKey, bool aIndex0
if ((sSettingsUsedSize + getAlignLength(addBlock.block.length) + sizeof(struct settingsBlock)) >=
settingsSize)
{
VerifyOrExit(swapSettingsBlock(aInstance) >= (getAlignLength(addBlock.block.length) + sizeof(struct settingsBlock)),
error = kThreadError_NoBufs);
otEXPECT_ACTION(swapSettingsBlock(aInstance) >= (getAlignLength(addBlock.block.length) + sizeof(struct settingsBlock)),
error = kThreadError_NoBufs);
}
utilsFlashWrite(sSettingsBaseAddress + sSettingsUsedSize,