Improvements in littlefs for virtual device (#2986)

Author: josesimoes

azure-pipelines.yml

@@ -240,6 +240,7 @@ jobs:
               if( 
                 (($files.where{$_.Contains('targets/netcore/nanoFramework.nanoCLR')}).Count -gt 0) -Or
                 (($files.where{$_.Contains('targets/netcore/nanoCLR.sln')}).Count -gt 0) -Or
+                (($files.where{$_.Contains('targets/netcore/littlefs')}).Count -gt 0) -Or
                 (($files.where{$_.Contains('targets/win32')}).Count -gt 0)
                 )
               {

targets/netcore/littlefs/hal_littlefs.c

@@ -334,45 +334,42 @@ int32_t hal_lfs_mount_partition(int32_t index, bool forceFormat)
 
         // mount the file system again
         operationResult = lfs_mount(&lfs[index], &lfsConfig[index]);
-
-        // create the root directory
-        lfs_mkdir(&lfs[index], "/");
     }
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // code block to assist testing littlefs
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    int32_t lfsIndex = 0;
-    char writeBuf[] = {
-        "Hello! if you get this message, congratulations, that's because littlefs is working on your device!!"};
-    char readBuf[sizeof(writeBuf)];
-
-    lfs_file_t file;
-    lfs_file_open(&lfs[lfsIndex], &file, "file1.txt", LFS_O_RDWR | LFS_O_CREAT);
-
-    if (lfs_file_write(&lfs[lfsIndex], &file, writeBuf, sizeof(writeBuf)) != sizeof(writeBuf))
-    {
-        // something went wrong
-        return -1;
-    }
-
-    lfs_file_close(&lfs[lfsIndex], &file);
-
-    // reopen the file and read it
-    lfs_file_open(&lfs[lfsIndex], &file, "file1.txt", LFS_O_RDONLY);
-    if (lfs_file_read(&lfs[lfsIndex], &file, readBuf, sizeof(readBuf)) != sizeof(writeBuf))
-    {
-        // something went wrong
-        return -1;
-    }
-
-    lfs_file_close(&lfs[lfsIndex], &file);
-
-    if (memcmp(writeBuf, readBuf, sizeof(writeBuf)) != 0)
-    {
-        // content doesn't match
-        return -1;
-    }
+    // int32_t lfsIndex = 0;
+    // char writeBuf[] = {
+    //     "Hello! if you get this message, congratulations, that's because littlefs is working on your device!!"};
+    // char readBuf[sizeof(writeBuf)];
+
+    // lfs_file_t file;
+    // lfs_file_open(&lfs[lfsIndex], &file, "file1.txt", LFS_O_RDWR | LFS_O_CREAT);
+
+    // if (lfs_file_write(&lfs[lfsIndex], &file, writeBuf, sizeof(writeBuf)) != sizeof(writeBuf))
+    //{
+    //     // something went wrong
+    //     return -1;
+    // }
+
+    // lfs_file_close(&lfs[lfsIndex], &file);
+
+    //// reopen the file and read it
+    // lfs_file_open(&lfs[lfsIndex], &file, "file1.txt", LFS_O_RDONLY);
+    // if (lfs_file_read(&lfs[lfsIndex], &file, readBuf, sizeof(readBuf)) != sizeof(writeBuf))
+    //{
+    //     // something went wrong
+    //     return -1;
+    // }
+
+    // lfs_file_close(&lfs[lfsIndex], &file);
+
+    // if (memcmp(writeBuf, readBuf, sizeof(writeBuf)) != 0)
+    //{
+    //     // content doesn't match
+    //     return -1;
+    // }
 
     return operationResult;
 }

targets/netcore/littlefs/littlefs_FS_Driver.cpp

@@ -719,6 +719,8 @@ HRESULT LITTLEFS_FS_Driver::GetAttributes(const VOLUME_ID *volume, const char *p
     lfs_info info;
     int32_t result;
     char normalizedPath[FS_MAX_DIRECTORY_LENGTH];
+    // set to empty attributes
+    uint32_t attributeBuffer = EMPTY_ATTRIBUTE;
 
     // set to empty attributes
     *attributes = EMPTY_ATTRIBUTE;
@@ -751,7 +753,7 @@ HRESULT LITTLEFS_FS_Driver::GetAttributes(const VOLUME_ID *volume, const char *p
         // if this is home directory
         if (info.type == LFS_TYPE_DIR && *normalizedPath == '\0')
         {
-            *attributes = FileAttributes::FileAttributes_Directory;
+            attributeBuffer = FileAttributes::FileAttributes_Directory;
 
             NANOCLR_SET_AND_LEAVE(S_OK);
         }
@@ -762,7 +764,7 @@ HRESULT LITTLEFS_FS_Driver::GetAttributes(const VOLUME_ID *volume, const char *p
             fsDrive,
             (const char *)normalizedPath,
             NANO_LITTLEFS_ATTRIBUTE,
-            attributes,
+            &attributeBuffer,
             NANO_LITTLEFS_ATTRIBUTE_SIZE);
 
         if (result >= LFS_ERR_OK || result == LFS_ERR_NOATTR)
@@ -772,7 +774,7 @@ HRESULT LITTLEFS_FS_Driver::GetAttributes(const VOLUME_ID *volume, const char *p
                 if (result == LFS_ERR_NOATTR)
                 {
                     // this is a directory, set dir attribute
-                    *attributes = FileAttributes::FileAttributes_Directory;
+                    attributeBuffer = FileAttributes::FileAttributes_Directory;
                 }
                 else
                 {
@@ -793,7 +795,11 @@ HRESULT LITTLEFS_FS_Driver::GetAttributes(const VOLUME_ID *volume, const char *p
         NANOCLR_SET_AND_LEAVE(CLR_E_INVALID_DRIVER);
     }
 
-    NANOCLR_NOCLEANUP();
+    NANOCLR_CLEANUP();
+
+    *attributes = attributeBuffer;
+
+    NANOCLR_CLEANUP_END();
 }
 
 HRESULT LITTLEFS_FS_Driver::SetAttributes(const VOLUME_ID *volume, const char *path, uint32_t attributes)