Merge pull request #13300 from rajkan01/storage_fsdir_restructure

Restructure storage filesystem directory

Author: 0xc0170

UNITTESTS/CMakeLists.txt

@@ -114,7 +114,10 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features"
   "${PROJECT_SOURCE_DIR}/../features/netsocket"
   "${PROJECT_SOURCE_DIR}/../platform"
+  "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
+  "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
   "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
+  "${PROJECT_SOURCE_DIR}/../storage/filesystem/include"
   "${PROJECT_SOURCE_DIR}/../drivers"
   "${PROJECT_SOURCE_DIR}/../hal"
   "${PROJECT_SOURCE_DIR}/../events"

UNITTESTS/empty_baseline/unittest.cmake

@@ -12,9 +12,6 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-    ../storage/filesystem/Dir.cpp
-    ../storage/filesystem/FileSystem.cpp
-    ../storage/filesystem/File.cpp
     ../storage/kvstore/global_api/kvstore_global_api.cpp
     ../storage/kvstore/securestore/SecureStore.cpp
     ../storage/kvstore/kv_map/KVMap.cpp

UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp

@@ -17,7 +17,7 @@
 #include "gtest/gtest.h"
 #include "blockdevice/HeapBlockDevice.h"
 #include "storage/kvstore/filesystemstore/FileSystemStore.h"
-#include "storage/filesystem/littlefs/LittleFileSystem.h"
+#include "littlefs/LittleFileSystem.h"
 #include "mbed_error.h"
 #include <stdlib.h>
 

UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake

@@ -11,10 +11,10 @@ set(unittest-includes ${unittest-includes}
 set(unittest-sources
   ../storage/blockdevice/source/HeapBlockDevice.cpp
   ../storage/kvstore/filesystemstore/FileSystemStore.cpp
-  ../storage/filesystem/littlefs/LittleFileSystem.cpp
-  ../storage/filesystem/Dir.cpp
-  ../storage/filesystem/File.cpp
-  ../storage/filesystem/FileSystem.cpp
+  ../storage/filesystem/littlefs/source/LittleFileSystem.cpp
+  ../storage/filesystem/source/Dir.cpp
+  ../storage/filesystem/source/File.cpp
+  ../storage/filesystem/source/FileSystem.cpp
   ../features/frameworks/mbed-trace/source/mbed_trace.c
   ../storage/filesystem/littlefs/littlefs/lfs_util.c
   ../storage/filesystem/littlefs/littlefs/lfs.c

storage/filesystem/fat/FATFileSystem.h renamed to storage/filesystem/fat/include/fat/FATFileSystem.h

@@ -26,7 +26,7 @@
 #ifndef MBED_FATFILESYSTEM_H
 #define MBED_FATFILESYSTEM_H
 
-#include "storage/filesystem/FileSystem.h"
+#include "filesystem/FileSystem.h"
 #include "blockdevice/BlockDevice.h"
 #include "FileHandle.h"
 #include <stdint.h>

storage/filesystem/fat/FATFileSystem.cpp renamed to storage/filesystem/fat/source/FATFileSystem.cpp

@@ -19,12 +19,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "storage/filesystem/fat/ChaN/diskio.h"
-#include "storage/filesystem/fat/ChaN/ffconf.h"
-#include "storage/filesystem/fat/ChaN/ff.h"
+#include "fat/ChaN/diskio.h"
+#include "fat/ChaN/ffconf.h"
+#include "fat/ChaN/ff.h"
 #include "platform/mbed_debug.h"
 #include "platform/mbed_critical.h"
-#include "storage/filesystem/mbed_filesystem.h"
+#include "filesystem/mbed_filesystem.h"
 #include "FATFileSystem.h"
 
 #include <errno.h>

storage/TESTS/filesystem/fat_filesystem/main.cpp renamed to storage/filesystem/fat/tests/TESTS/fat/fat_filesystem/main.cpp

@@ -17,7 +17,7 @@
 #ifndef DIR_H
 #define DIR_H
 
-#include "storage/filesystem/FileSystem.h"
+#include "filesystem/FileSystem.h"
 #include "platform/DirHandle.h"
 
 namespace mbed {

storage/TESTS/filesystem/multipart_fat_filesystem/main.cpp renamed to storage/filesystem/fat/tests/TESTS/fat/multipart_fat_filesystem/main.cpp

@@ -17,7 +17,7 @@
 #ifndef FILE_H
 #define FILE_H
 
-#include "storage/filesystem/FileSystem.h"
+#include "filesystem/FileSystem.h"
 #include "platform/FileHandle.h"
 
 namespace mbed {