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 #9407 from offirko/offir_direct_access_handle_default_config 

DirectAccess DeviceKey: add support for default storage type
pull/9428/head
Martin Kojtal 2019-01-18 11:31:51 +01:00 committed by GitHub
parent 46bb7540be e996b7f9ce
commit 40f40ac188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
features/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp
View File

@ -245,7 +245,7 @@ void test_direct_access_to_device_inject_root()
uint32_t key[DEVICE_KEY_16BYTE / sizeof(uint32_t)];
KVMap &kv_map = KVMap::get_instance();
KVStore *inner_store = kv_map.get_internal_kv_instance(NULL);
TEST_ASSERT_NOT_EQUAL(NULL, inner_store);
TEST_SKIP_UNLESS_MESSAGE(inner_store != NULL, "Test skipped. No KVStore Internal");
BlockDevice *flash_bd = kv_map.get_internal_blockdevice_instance("");
TEST_ASSERT_NOT_EQUAL(NULL, flash_bd);
@ -271,6 +271,20 @@ void test_direct_access_to_device_inject_root()
internal_start_address = MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_BASE_ADDRESS;
internal_rbp_size = MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE;
is_conf_tdb_internal = true;
} else if (strcmp(STR(MBED_CONF_STORAGE_STORAGE_TYPE), "default") == 0) {
#if COMPONENT_QSPIF || COMPONENT_SPIF || COMPONENT_DATAFLASH
internal_start_address = MBED_CONF_STORAGE_TDB_EXTERNAL_INTERNAL_BASE_ADDRESS;
internal_rbp_size = MBED_CONF_STORAGE_TDB_EXTERNAL_RBP_INTERNAL_SIZE;
#elif COMPONENT_SD
internal_start_address = MBED_CONF_STORAGE_FILESYSTEM_INTERNAL_BASE_ADDRESS;
internal_rbp_size = MBED_CONF_STORAGE_FILESYSTEM_RBP_INTERNAL_SIZE;
#elif COMPONENT_FLASHIAP
internal_start_address = MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_BASE_ADDRESS;
internal_rbp_size = MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE;
is_conf_tdb_internal = true;
#else
TEST_SKIP_UNLESS_MESSAGE(false, "Test skipped. No KVStore Internal");
#endif
} else {
TEST_SKIP_UNLESS_MESSAGE(false, "Test skipped. No KVStore Internal");
}

9
features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
View File

@ -123,6 +123,15 @@ int get_expected_internal_TDBStore_position(uint32_t *out_tdb_start_offset, uin
} else if (strcmp(STR(MBED_CONF_STORAGE_STORAGE_TYPE), "TDB_EXTERNAL") == 0) {
*out_tdb_start_offset = MBED_CONF_STORAGE_TDB_EXTERNAL_INTERNAL_BASE_ADDRESS;
tdb_size = MBED_CONF_STORAGE_TDB_EXTERNAL_RBP_INTERNAL_SIZE;
} else if (strcmp(STR(MBED_CONF_STORAGE_STORAGE_TYPE), "default") == 0) {
#if COMPONENT_QSPIF || COMPONENT_SPIF || COMPONENT_DATAFLASH
*out_tdb_start_offset = MBED_CONF_STORAGE_TDB_EXTERNAL_INTERNAL_BASE_ADDRESS;
tdb_size = MBED_CONF_STORAGE_TDB_EXTERNAL_RBP_INTERNAL_SIZE;
#elif COMPONENT_SD
tdb_size = MBED_CONF_STORAGE_FILESYSTEM_RBP_INTERNAL_SIZE;
#else
return MBED_ERROR_UNSUPPORTED;
#endif
} else {
return MBED_ERROR_UNSUPPORTED;
}