11 files changed, 26 insertions(+), 13 deletions(-)

M host-tools/genlittlefs/lfs_ioaccess.c
M host-tools/genlittlefs/mklfs.c
M module-vfs/drivers/include/purefs/fs/drivers/directory_handle_littlefs.hpp
M module-vfs/drivers/include/purefs/fs/drivers/file_handle_littlefs.hpp
M module-vfs/drivers/include/purefs/fs/drivers/mount_point_littlefs.hpp
M module-vfs/drivers/src/purefs/fs/filesystem_littlefs.cpp
M module-vfs/drivers/src/thirdparty/littlefs/lfs_glue.cpp
M module-vfs/thirdparty/lfsfs/CMakeLists.txt
A module-vfs/thirdparty/lfsfs/include/littlefs/lfs.h
R module-vfs/thirdparty/lfsfs/lfsextension/include/{ => littlefs}/lfs_extension.h
M module-vfs/thirdparty/lfsfs/lfsextension/src/lfs_extension.c

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "lfs.h"
+#include <littlefs/lfs.h>
 #include "lfs_ioaccess.h"
 #include "parse_partitions.h"
 

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "lfs.h"
+#include <littlefs/lfs.h>
 #include "lfs_ioaccess.h"
 #include "parse_partitions.h"
 #include "parse_args.h"

@@ 4,7 4,7 @@
 #pragma once
 
 #include <purefs/fs/directory_handle.hpp>
-#include <lfs.h>
+#include <littlefs/lfs.h>
 
 namespace purefs::fs::drivers
 {

@@ 4,7 4,7 @@
 #pragma once
 
 #include <purefs/fs/file_handle.hpp>
-#include <lfs.h>
+#include <littlefs/lfs.h>
 
 namespace purefs::fs::drivers
 {

@@ 2,7 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #pragma once
 #include <purefs/fs/mount_point.hpp>
-#include <lfs.h>
+#include <littlefs/lfs.h>
 
 namespace purefs::fs::drivers
 {

@@ 8,8 8,8 @@
 #include <purefs/fs/drivers/directory_handle_littlefs.hpp>
 #include <purefs/blkdev/disk_manager.hpp>
 #include <purefs/blkdev/disk_handle.hpp>
-#include <lfs.h>
-#include <lfs_extension.h>
+#include <littlefs/lfs.h>
+#include <littlefs/lfs_extension.h>
 #include <log/log.hpp>
 
 #include <climits>

@@ 1,7 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 #include <littlefs/volume_mapper.hpp>
-#include <lfs.h>
+#include <littlefs/lfs.h>
 #include <purefs/blkdev/disk_handle.hpp>
 #include <purefs/blkdev/disk_manager.hpp>
 #include <log/log.hpp>

@@ 5,6 5,7 @@ project(littlefs LANGUAGES C)
 include(thirdparty OPTIONAL)
 
 set(LIBLITTLEFS_SRCDIR littlefs)
+set(LIBLITTLEFS_INCDIR include)
 set(LIBLITTLEFS_SRCDIR_EXT lfsextension/src)
 set(LIBLITTLEFS_INCDIR_EXT lfsextension/include)
 set(LIBLITTLEFS_TARGET ${PROJECT_NAME})


@@ 18,8 19,8 @@ set(LIBLITTLEFS_SOURCES
         ${LIBLITTLEFS_SRCDIR_EXT}/lfs_extension.c
 )
 
-set( LIBLITTLEFS_PUBLIC_INCLUDES  ${LIBLITTLEFS_SRCDIR} ${LIBLITTLEFS_INCDIR_EXT})
-set( LIBLITTLEFS_PRIVATE_INCLUDES ${LIBLITTLEFS_SRCDIR}/bd )
+set( LIBLITTLEFS_PUBLIC_INCLUDES  ${LIBLITTLEFS_INCDIR} ${LIBLITTLEFS_INCDIR_EXT})
+set( LIBLITTLEFS_PRIVATE_INCLUDES ${LIBLITTLEFS_SRCDIR} )
 
 
 add_library( ${LIBLITTLEFS_TARGET} STATIC ${LIBLITTLEFS_SOURCES} )

@@ 0,0 1,5 @@
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+#include "../../littlefs/lfs.h"

@@ 1,9 1,16 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+/* NOTE: Currently littlefs doesn't support auto detecting block_size and block_count
+ * basing on the data stored in the the super block of formatted filesystem.
+ * It expect data passed during filesystem initialization.
+ * This extension implements really naive algorithm for finding first
+ *superblock entry and read block_size and blocks count from the super block
+ */
+
 #pragma once
 
-#include "lfs.h"
+#include <littlefs/lfs.h>
 
 #ifdef __cplusplus
 extern "C"


@@ 16,6 23,7 @@ extern "C"
      */
     int lfs_extension_read_config_from_superblock(struct lfs_config *cfg, size_t sector_size)
         __attribute__((nonnull(1)));
+
 #ifdef __cplusplus
 }
 #endif

@@ 1,8 1,7 @@
 // Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "lfs_extension.h"
-#include "lfs_util.h"
+#include <littlefs/lfs_extension.h>
 
 static inline void lfs_superblock_fromle32(lfs_superblock_t *superblock)
 {