diff --git a/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h b/storage/kvstore/direct_access_devicekey/include/direct_access_devicekey/DirectAccessDevicekey.h similarity index 100% rename from storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.h rename to storage/kvstore/direct_access_devicekey/include/direct_access_devicekey/DirectAccessDevicekey.h diff --git a/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp b/storage/kvstore/direct_access_devicekey/source/DirectAccessDevicekey.cpp similarity index 99% rename from storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp rename to storage/kvstore/direct_access_devicekey/source/DirectAccessDevicekey.cpp index 2bd1930dfd..5a4c9522e0 100644 --- a/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp +++ b/storage/kvstore/direct_access_devicekey/source/DirectAccessDevicekey.cpp @@ -16,7 +16,7 @@ // ----------------------------------------------------------- Includes ----------------------------------------------------------- #if DEVICE_FLASH -#include "DirectAccessDevicekey.h" +#include "direct_access_devicekey/DirectAccessDevicekey.h" #include "drivers/FlashIAP.h" #include #include diff --git a/storage/kvstore/conf/filesystem/mbed_lib.json b/storage/kvstore/kv_config/filesystem/mbed_lib.json similarity index 99% rename from storage/kvstore/conf/filesystem/mbed_lib.json rename to storage/kvstore/kv_config/filesystem/mbed_lib.json index 836da52074..e89f304010 100644 --- a/storage/kvstore/conf/filesystem/mbed_lib.json +++ b/storage/kvstore/kv_config/filesystem/mbed_lib.json @@ -24,7 +24,7 @@ "external_base_address": { "help": "The default will set start address to address 0", "value": "0" - }, + }, "mount_point": { "help": "Where to mount the filesystem.", "value": "kv" diff --git a/storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json b/storage/kvstore/kv_config/filesystem_no_rbp/mbed_lib.json similarity index 98% rename from storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json rename to storage/kvstore/kv_config/filesystem_no_rbp/mbed_lib.json index 8202a681fd..db0eed84fa 100644 --- a/storage/kvstore/conf/filesystem_no_rbp/mbed_lib.json +++ b/storage/kvstore/kv_config/filesystem_no_rbp/mbed_lib.json @@ -16,7 +16,7 @@ "external_base_address": { "help": "The default will set start address to address 0", "value": "0" - }, + }, "mount_point": { "help": "Where to mount the filesystem.", "value": "kv" diff --git a/storage/kvstore/conf/global/mbed_lib.json b/storage/kvstore/kv_config/global/mbed_lib.json similarity index 100% rename from storage/kvstore/conf/global/mbed_lib.json rename to storage/kvstore/kv_config/global/mbed_lib.json diff --git a/storage/kvstore/conf/kv_config.h b/storage/kvstore/kv_config/include/kv_config/kv_config.h similarity index 100% rename from storage/kvstore/conf/kv_config.h rename to storage/kvstore/kv_config/include/kv_config/kv_config.h diff --git a/storage/kvstore/conf/mbed_lib.json b/storage/kvstore/kv_config/mbed_lib.json similarity index 100% rename from storage/kvstore/conf/mbed_lib.json rename to storage/kvstore/kv_config/mbed_lib.json diff --git a/storage/kvstore/conf/kv_config.cpp b/storage/kvstore/kv_config/source/kv_config.cpp similarity index 99% rename from storage/kvstore/conf/kv_config.cpp rename to storage/kvstore/kv_config/source/kv_config.cpp index a6fe209806..8114a68b05 100644 --- a/storage/kvstore/conf/kv_config.cpp +++ b/storage/kvstore/kv_config/source/kv_config.cpp @@ -15,20 +15,20 @@ */ #include "kv_config.h" -#include "storage/kvstore/include/KVStore.h" -#include "storage/kvstore/kv_map/KVMap.h" +#include "kvstore/KVStore.h" +#include "kvstore/KVMap.h" #include "blockdevice/BlockDevice.h" #include "filesystem/FileSystem.h" -#include "storage/kvstore/filesystemstore/FileSystemStore.h" +#include "kvstore/FileSystemStore.h" #include "blockdevice/SlicingBlockDevice.h" #include "fat/FATFileSystem.h" #include "littlefs/LittleFileSystem.h" -#include "storage/kvstore/tdbstore/TDBStore.h" +#include "kvstore/TDBStore.h" #include "mbed_error.h" #include "drivers/FlashIAP.h" #include "blockdevice/FlashSimBlockDevice.h" #include "mbed_trace.h" -#include "storage/kvstore/securestore/SecureStore.h" +#include "securestore/SecureStore.h" #define TRACE_GROUP "KVCFG" #if COMPONENT_FLASHIAP diff --git a/storage/kvstore/conf/tdb_external/mbed_lib.json b/storage/kvstore/kv_config/tdb_external/mbed_lib.json similarity index 100% rename from storage/kvstore/conf/tdb_external/mbed_lib.json rename to storage/kvstore/kv_config/tdb_external/mbed_lib.json diff --git a/storage/kvstore/conf/tdb_external_no_rbp/mbed_lib.json b/storage/kvstore/kv_config/tdb_external_no_rbp/mbed_lib.json similarity index 100% rename from storage/kvstore/conf/tdb_external_no_rbp/mbed_lib.json rename to storage/kvstore/kv_config/tdb_external_no_rbp/mbed_lib.json diff --git a/storage/kvstore/conf/tdb_internal/mbed_lib.json b/storage/kvstore/kv_config/tdb_internal/mbed_lib.json similarity index 100% rename from storage/kvstore/conf/tdb_internal/mbed_lib.json rename to storage/kvstore/kv_config/tdb_internal/mbed_lib.json diff --git a/storage/kvstore/securestore/SecureStore.h b/storage/kvstore/securestore/include/securestore/SecureStore.h similarity index 100% rename from storage/kvstore/securestore/SecureStore.h rename to storage/kvstore/securestore/include/securestore/SecureStore.h diff --git a/storage/kvstore/securestore/SecureStore.cpp b/storage/kvstore/securestore/source/SecureStore.cpp similarity index 99% rename from storage/kvstore/securestore/SecureStore.cpp rename to storage/kvstore/securestore/source/SecureStore.cpp index 394e7d1573..b3c792991c 100644 --- a/storage/kvstore/securestore/SecureStore.cpp +++ b/storage/kvstore/securestore/source/SecureStore.cpp @@ -16,7 +16,7 @@ // ----------------------------------------------------------- Includes ----------------------------------------------------------- -#include "SecureStore.h" +#include "securestore/SecureStore.h" #if SECURESTORE_ENABLED