Refactore storage/kvstore directory

storage/kvstore/filesystemstore/mbed_lib.json

@@ -1,3 +0,0 @@
-{
-    "name": "filesystemstore"
-}

storage/kvstore/global_api/mbed_lib.json

@@ -1,3 +0,0 @@
-{
-    "name": "kv-global-api"
-}

storage/kvstore/include/kvstore/FileSystemStore.h

@@ -18,7 +18,7 @@
 #ifndef MBED_FILE_SYSTEM_STORE_H
 #define MBED_FILE_SYSTEM_STORE_H
 
-#include "storage/kvstore/include/KVStore.h"
+#include "kvstore/KVStore.h"
 #include "filesystem/FileSystem.h"
 
 namespace mbed {

storage/kvstore/include/kvstore/KVMap.h

@@ -16,7 +16,7 @@
 #ifndef _KV_MAP
 #define _KV_MAP
 
-#include "storage/kvstore/include/KVStore.h"
+#include "kvstore/KVStore.h"
 #include "platform/PlatformMutex.h"
 #include "platform/SingletonPtr.h"
 #include "blockdevice/BlockDevice.h"

storage/kvstore/include/kvstore/TDBStore.h

@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "storage/kvstore/include/KVStore.h"
+#include "kvstore/KVStore.h"
 #include "blockdevice/BlockDevice.h"
 #include "blockdevice/BufferedBlockDevice.h"
 #include "PlatformMutex.h"

storage/kvstore/kv_map/mbed_lib.json

@@ -1,3 +0,0 @@
-{
-    "name": "kv-map"
-}

storage/kvstore/source/FileSystemStore.cpp

@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#include "FileSystemStore.h"
-#include "storage/kvstore/conf/kv_config.h"
+#include "kvstore/FileSystemStore.h"
+#include "kv_config/kv_config.h"
 #include "filesystem/Dir.h"
 #include "filesystem/File.h"
 #include "blockdevice/BlockDevice.h"
@@ -635,6 +635,3 @@ static char *string_ndup(const char *src, size_t size)
     string_copy[size] = '\0';
     return string_copy;
 }
-
-
-

storage/kvstore/source/KVMap.cpp

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "storage/kvstore/include/KVStore.h"
-#include "storage/kvstore/kv_map/KVMap.h"
-#include "storage/kvstore/conf/kv_config.h"
+#include "kvstore/KVStore.h"
+#include "kvstore/KVMap.h"
+#include "kv_config/kv_config.h"
 #include <stdlib.h>
 #include "string.h"
 #include "mbed_error.h"
@@ -333,4 +333,3 @@ FileSystem *KVMap::get_external_filesystem_instance(const char *name)
 }
 
 } // namespace mbed
-

storage/kvstore/source/TDBStore.cpp

@@ -16,7 +16,7 @@
 
 // ----------------------------------------------------------- Includes -----------------------------------------------------------
 
-#include "TDBStore.h"
+#include "kvstore/TDBStore.h"
 
 #include <algorithm>
 #include <string.h>

storage/kvstore/source/kvstore_global_api.cpp

@@ -15,9 +15,9 @@
  */
 #include "kvstore_global_api.h"
 
-#include "storage/kvstore/conf/kv_config.h"
-#include "storage/kvstore/kv_map/KVMap.h"
-#include "storage/kvstore/include/KVStore.h"
+#include "kv_config/kv_config.h"
+#include "kvstore/KVMap.h"
+#include "kvstore/KVStore.h"
 #include "mbed_error.h"
 
 using namespace mbed;
@@ -201,4 +201,3 @@ int kv_reset(const char *kvstore_name)
     return ret;
 
 }
-

storage/kvstore/tdbstore/mbed_lib.json

@@ -1,3 +0,0 @@
-{
-    "name": "tdbstore"
-}