ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9361 from yossi2le/yossi_fix_for_tfm 

Removing dependency of TDBStore in SystemStorage file and moving some file location - TFM support.
pull/10931/head
Cruz Monrreal 2019-01-16 22:06:07 -06:00 committed by GitHub
parent d0665c8458 971e29b669
commit 4f95298669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
features/storage/kvstore/tdbstore/DirectAccessDevicekey.cpp → features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
View File

0
features/storage/kvstore/tdbstore/DirectAccessDevicekey.h → features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h
View File

0
features/storage/kvstore/KVStore.h → features/storage/kvstore/include/KVStore.h
View File

8
features/storage/kvstore/tdbstore/TDBStore.cpp
View File

@ -24,7 +24,10 @@
#include "mbed_error.h" #include "mbed_error.h"
#include "mbed_wait_api.h" #include "mbed_wait_api.h"
#include "MbedCRC.h" #include "MbedCRC.h"
//Bypass the check of NVStore co existance if compiled for TARGET_TFM
#if !(BYPASS_NVSTORE_CHECK)
#include "SystemStorage.h" #include "SystemStorage.h"
#endif
using namespace mbed; using namespace mbed;
@ -990,6 +993,9 @@ int TDBStore::init()
goto end; goto end;
} }
//Bypass the check of NVStore co existance if compiled for TARGET_TFM
#if !(BYPASS_NVSTORE_CHECK)
//Check if we are on internal memory && try to set the internal memory for TDBStore use. //Check if we are on internal memory && try to set the internal memory for TDBStore use.
if (strcmp(_bd->get_type(), "FLASHIAP") == 0 && if (strcmp(_bd->get_type(), "FLASHIAP") == 0 &&
avoid_conflict_nvstore_tdbstore(TDBSTORE) == MBED_ERROR_ALREADY_INITIALIZED) { avoid_conflict_nvstore_tdbstore(TDBSTORE) == MBED_ERROR_ALREADY_INITIALIZED) {
@ -997,6 +1003,8 @@ int TDBStore::init()
MBED_ERROR(MBED_ERROR_ALREADY_INITIALIZED, "TDBStore in internal memory can not be initialize when NVStore is in use"); MBED_ERROR(MBED_ERROR_ALREADY_INITIALIZED, "TDBStore in internal memory can not be initialize when NVStore is in use");
} }
#endif
_max_keys = initial_max_keys; _max_keys = initial_max_keys;
ram_table = new ram_table_entry_t[_max_keys]; ram_table = new ram_table_entry_t[_max_keys];