Improve storage

src/HAL/Include/nanoHAL_Windows_Storage.h → src/HAL/Include/nanoHAL_Persistent_Storage.h

@@ -2,31 +2,40 @@
 // Copyright (c) .NET Foundation and Contributors
 // See LICENSE file in the project root for full license information.
 //
-#ifndef NANOHAL_WINDOWS_STORAGE_H
-#define NANOHAL_WINDOWS_STORAGE_H
+#ifndef NANOHAL_PERSISTENT_STORAGE_H
+#define NANOHAL_PERSISTENT_STORAGE_H
 
 #include <Target_Windows_Storage.h>
 
 // FatFs define for size of file name members
 // ANSI/OEM at DBCS
+#ifndef FF_LFN_BUF
 #define FF_LFN_BUF 255
+#endif
 
 // driver letters and paths
-// drive letter for SD Card
+
+#define DRIVE_PATH_STR "\\"
+
+// SD Card
 #define INDEX0_DRIVE_LETTER "D:"
-#define INDEX0_DRIVE_PATH   INDEX0_DRIVE_LETTER "\\"
-// drive letter for USB mass storage device
+#define INDEX0_DRIVE_PATH   INDEX0_DRIVE_LETTER DRIVE_PATH_STR
+
+// USB mass storage device
 #define INDEX1_DRIVE_LETTER "E:"
-#define INDEX1_DRIVE_PATH   INDEX1_DRIVE_LETTER "\\"
-// spare drive letter
+#define INDEX1_DRIVE_PATH   INDEX1_DRIVE_LETTER DRIVE_PATH_STR
+
+// USB mass storage device 2
 #define INDEX2_DRIVE_LETTER "F:"
-#define INDEX2_DRIVE_PATH   INDEX2_DRIVE_LETTER "\\"
-// drive letter for internal drive (SPIFFS)
-#define INTERNAL_DRIVE0_LETTER "I:"
-#define INTERNAL_DRIVE0_PATH   INTERNAL_DRIVE0_LETTER "\\"
-// drive letter for second internal drive (SPIFFS)
-#define INTERNAL_DRIVE1_LETTER "J:"
-#define INTERNAL_DRIVE1_PATH   INTERNAL_DRIVE1_LETTER "\\"
+#define INDEX2_DRIVE_PATH   INDEX2_DRIVE_LETTER DRIVE_PATH_STR
+
+// Internal drive 0 (SPIFFS)
+#define INDEX3_DRIVE_LETTER "I:"
+#define INDEX3_DRIVE_PATH   INDEX3_DRIVE_LETTER DRIVE_PATH_STR
+
+// Internal drive 1 (SPIFFS)
+#define INDEX4_DRIVE_LETTER "J:"
+#define INDEX4_DRIVE_PATH   INDEX4_DRIVE_LETTER DRIVE_PATH_STR
 
 //////////////////////////////////////////////////////////////////////////
 // Keep in sync with StorageEventManager.StorageEventType in managed code
@@ -47,8 +56,8 @@ typedef enum StorageEventType
 
 // constants to be used throughout the code
 #define SUPPORTED_DRIVES_COUNT (2)
-#define DRIVE_LETTER_LENGTH    sizeof(INDEX0_DRIVE_LETTER)
-#define DRIVE_PATH_LENGTH      sizeof(INDEX0_DRIVE_PATH)
+#define DRIVE_LETTER_LENGTH    (2)
+#define DRIVE_PATH_LENGTH      (DRIVE_LETTER_LENGTH + sizeof(DRIVE_PATH_STR))
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // !!! KEEP IN SYNC WITH Windows.Storage.CreationCollisionOption (in managed code) !!! //
@@ -73,4 +82,4 @@ extern "C"
 }
 #endif
 
-#endif // NANOHAL_WINDOWS_STORAGE_H
+#endif // NANOHAL_PERSISTENT_STORAGE_H

src/HAL/Include/nanoHAL_v2.h

@@ -411,6 +411,6 @@ extern "C"
 #include <nanoHAL_Watchdog.h>
 #include <nanoHAL_Rtos.h>
 
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 
 #endif // NANOHAL_V2_H

src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_Directory.cpp

@@ -398,7 +398,9 @@ HRESULT EnumerateDrives(CLR_RT_HeapBlock *array, int &count)
         }
 
         count = 0;
-        for (char drive = INDEX0_DRIVE_LETTER[0]; drive <= INTERNAL_DRIVE0_LETTER[0]; drive++)
+        // SPIFFS cannot handle directory structures, so only check the valid drives.
+        // FIXME: return warning if the drive type cannot handle directories.
+        for (char drive = INDEX0_DRIVE_LETTER[0]; drive <= INDEX2_DRIVE_LETTER[0]; drive++)
         {
             workingDrive[0] = drive;
 

src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_File.cpp

@@ -6,7 +6,7 @@
 #include "nf_sys_io_filesystem.h"
 
 #include <ff.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 
 extern SYSTEMTIME GetDateTime(uint16_t date, uint16_t time);
 extern void CombinePathAndName(char *outpath, const char *path1, const char *path2);

src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_FileStream.cpp

@@ -6,7 +6,7 @@
 #include "nf_sys_io_filesystem.h"
 
 #include <ff.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 
 void CombinePathAndName(char *outpath, const char *path1, const char *path2)
 {

targets/ChibiOS/_common/Target_Windows_Storage.c

@@ -7,7 +7,7 @@
 #include <cmsis_os.h>
 #include <ff.h>
 #include <target_windows_storage_config.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 #include <Target_Windows_Storage.h>
 #include <nanoHAL_v2.h>
 

targets/ChibiOS/_nanoCLR/Windows.Storage/win_storage_native_Windows_Storage_FileIO.cpp

@@ -18,11 +18,11 @@
 
 int32_t GetInternalDriveIndex(char *drive)
 {
-    if (memcmp(drive, INTERNAL_DRIVE0_LETTER, sizeof(INTERNAL_DRIVE0_LETTER) - 1) == 0)
+    if (memcmp(drive, INDEX3_DRIVE_LETTER, sizeof(INDEX3_DRIVE_LETTER) - 1) == 0)
     {
         return 0;
     }
-    if (memcmp(drive, INTERNAL_DRIVE1_LETTER, sizeof(INTERNAL_DRIVE1_LETTER) - 1) == 0)
+    if (memcmp(drive, INDEX4_DRIVE_LETTER, sizeof(INDEX4_DRIVE_LETTER) - 1) == 0)
     {
         return 1;
     }

targets/ChibiOS/_nanoCLR/Windows.Storage/win_storage_native_Windows_Storage_StorageFolder.cpp

@@ -274,11 +274,11 @@ HRESULT Library_win_storage_native_Windows_Storage_StorageFolder::
         switch (driveIterator)
         {
             case 0:
-                memcpy(workingDrive, INTERNAL_DRIVE0_PATH, DRIVE_PATH_LENGTH);
+                memcpy(workingDrive, INDEX3_DRIVE_PATH, DRIVE_PATH_LENGTH);
                 break;
 
             case 1:
-                memcpy(workingDrive, INTERNAL_DRIVE1_PATH, DRIVE_PATH_LENGTH);
+                memcpy(workingDrive, INDEX4_DRIVE_PATH, DRIVE_PATH_LENGTH);
                 break;
 
             default:

targets/ChibiOS/_nanoCLR/Windows.Storage/win_storage_native_target.h

@@ -10,13 +10,12 @@
 #include <hal.h>
 #include <win_storage_native.h>
 #include <target_windows_storage_config.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 #include <Target_Windows_Storage.h>
-#include <nanoHAL_Windows_Storage.h>
 
 #define WORKING_DRIVE_IS_INTERNAL_DRIVE                                                                                \
-    (memcmp(workingDrive, INTERNAL_DRIVE0_LETTER, sizeof(INTERNAL_DRIVE0_LETTER) - 1) == 0 ||                          \
-     memcmp(workingDrive, INTERNAL_DRIVE1_LETTER, sizeof(INTERNAL_DRIVE1_LETTER) - 1) == 0)
+    (memcmp(workingDrive, INDEX3_DRIVE_LETTER, sizeof(INDEX3_DRIVE_LETTER) - 1) == 0 ||                                \
+     memcmp(workingDrive, INDEX4_DRIVE_LETTER, sizeof(INDEX4_DRIVE_LETTER) - 1) == 0)
 
 extern int32_t GetInternalDriveIndex(char *drive);
 

targets/ESP32/_common/Target_Windows_Storage.c

@@ -37,7 +37,7 @@
 #include <target_platform.h>
 
 #include <Target_Windows_Storage.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 
 #if !defined(CONFIG_IDF_TARGET_ESP32C3) && (HAL_USE_SDC == TRUE)
 

targets/ESP32/_common/targetHAL_ConfigStorageSPIFFS.c

@@ -8,7 +8,7 @@
 #include "targetHAL_ConfigStorage.h"
 #include <esp_vfs.h>
 
-// this one is following the the same "drive letter" as the HAL Windows Storage INTERNAL_DRIVE0_LETTER
+// this one is following the the same "drive letter" as the HAL Windows Storage INDEX3_DRIVE_LETTER
 #define NANO_SPIFFS_BASE_PATH   "/I"
 #define NANO_SPIFFS_CONFIG_NAME "con_"
 

targets/ESP32/_nanoCLR/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_Directory.cpp

@@ -399,7 +399,9 @@ static HRESULT EnumerateDrives(CLR_RT_HeapBlock *array, int &count)
         }
 
         count = 0;
-        for (char drive = INDEX0_DRIVE_LETTER[0]; drive <= INTERNAL_DRIVE0_LETTER[0]; drive++)
+        // SPIFFS cannot handle directory structures, so only check the valid drives.
+        // FIXME: return warning if the drive type cannot handle directories.
+        for (char drive = INDEX0_DRIVE_LETTER[0]; drive <= INDEX2_DRIVE_LETTER[0]; drive++)
         {
             workingDrive[1] = drive;
             currentDirectory = opendir(workingDrive);

targets/ESP32/_nanoCLR/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_File.cpp

@@ -6,14 +6,14 @@
 #include "nf_sys_io_filesystem.h"
 
 #include <ff.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 
 extern void CombinePathAndName(char *outpath, const char *path1, const char *path2);
 extern char *ConvertToVfsPath(const char *filepath);
 
 bool IsInternalFilePath(const char *filePath)
 {
-    if (filePath[0] == INTERNAL_DRIVE0_LETTER[0])
+    if (filePath[0] == INDEX3_DRIVE_LETTER[0])
     {
         return true;
     }

targets/ESP32/_nanoCLR/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_FileStream.cpp

@@ -6,7 +6,7 @@
 #include "nf_sys_io_filesystem.h"
 
 #include <ff.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 
 void CombinePathAndName(char *outpath, const char *path1, const char *path2)
 {

targets/ESP32/_nanoCLR/Windows.Storage/win_storage_native_Windows_Storage_Devices_SDCard.cpp

@@ -5,7 +5,7 @@
 
 #include "win_storage_native_target.h"
 #include <target_windows_storage_config.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 #include <target_platform.h>
 #include <Esp32_DeviceMapping.h>
 

targets/ESP32/_nanoCLR/Windows.Storage/win_storage_native_Windows_Storage_FileIO.cpp

@@ -6,7 +6,7 @@
 #include <ff.h>
 #include "win_storage_native_target.h"
 #include <target_windows_storage_config.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 #include <target_platform.h>
 
 // defining these types here to make it shorter and improve code readability

targets/ESP32/_nanoCLR/Windows.Storage/win_storage_native_Windows_Storage_StorageFolder.cpp

@@ -6,7 +6,7 @@
 #include "win_storage_native_target.h"
 #include <target_windows_storage_config.h>
 #include <Target_Windows_Storage.h>
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 #include <target_platform.h>
 
 //
@@ -302,7 +302,7 @@ HRESULT Library_win_storage_native_Windows_Storage_StorageFolder::
             // dereference the object in order to reach its fields
             hbObj = storageFolder->Dereference();
 
-            memcpy(workingDrive, INTERNAL_DRIVE0_PATH, DRIVE_PATH_LENGTH);
+            memcpy(workingDrive, INDEX3_DRIVE_PATH, DRIVE_PATH_LENGTH);
 
             // set the managed fields
             NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_String::CreateInstance(

targets/FreeRTOS/NXP/_common/Target_Windows_Storage.c

@@ -8,19 +8,17 @@
 #include "task.h"
 
 #include "ff.h"
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 #include <Target_Windows_Storage.h>
 #include <nanoHAL_v2.h>
 
 #include "fsl_sd.h"
 
-
 // need to declare this here as extern
 extern void PostManagedEvent(uint8_t category, uint8_t subCategory, uint16_t data1, uint32_t data2);
 
-#define SD_CARD_DRIVE_INDEX             "0"
-#define SD_CARD_DRIVE_INDEX_NUMERIC     (0)
-
+#define SD_CARD_DRIVE_INDEX         "0"
+#define SD_CARD_DRIVE_INDEX_NUMERIC (0)
 
 ///////////////////////////////////////////
 // code specific to SD Card
@@ -31,12 +29,12 @@ bool sdCardFileSystemReady;
 static FATFS sdCard_FS;
 
 /*!
-* call back function for SD card detect.
-*
-* @param isInserted  true,  indicate the card is insert.
-*                    false, indicate the card is remove.
-* @param userData
-*/
+ * call back function for SD card detect.
+ *
+ * @param isInserted  true,  indicate the card is insert.
+ *                    false, indicate the card is remove.
+ * @param userData
+ */
 static void SDCARD_DetectCallBack(bool isInserted, void *userData);
 
 /*! Card descriptor. */
@@ -83,44 +81,45 @@ static void CardDetectTask(void *pvParameters)
         vTaskDelay(100 / portTICK_PERIOD_MS);
         if (s_cardInserted)
         {
-            //Card inserted.
+            // Card inserted.
             /* power on the card */
             SD_PowerOnCard(g_sd.host.base, g_sd.usrParam.pwr);
             /* Init card. */
             if (SD_CardInit(&g_sd))
             {
-                //SD card init failed.
+                // SD card init failed.
                 continue;
             }
 
             FRESULT err = f_mount(&sdCard_FS, "0", 1U);
-            if (err != FR_OK) {
+            if (err != FR_OK)
+            {
                 vTaskDelay(1000 / portTICK_PERIOD_MS);
                 SD_CardDeinit(&g_sd);
                 continue;
             }
             sdCardFileSystemReady = true;
 
             // post event to managed app
-            PostManagedEvent( EVENT_STORAGE, 0, StorageEventType_RemovableDeviceInsertion, SD_CARD_DRIVE_INDEX_NUMERIC );
+            PostManagedEvent(EVENT_STORAGE, 0, StorageEventType_RemovableDeviceInsertion, SD_CARD_DRIVE_INDEX_NUMERIC);
         }
         else
         {
             SD_CardDeinit(&g_sd);
 
-            //Card removed
+            // Card removed
             sdCardFileSystemReady = false;
 
             // post event to managed app
-            PostManagedEvent( EVENT_STORAGE, 0, StorageEventType_RemovableDeviceRemoval, SD_CARD_DRIVE_INDEX_NUMERIC );
+            PostManagedEvent(EVENT_STORAGE, 0, StorageEventType_RemovableDeviceRemoval, SD_CARD_DRIVE_INDEX_NUMERIC);
         }
     }
 }
 
-void SdCardThread(void * argument)
+void SdCardThread(void *argument)
 {
     (void)argument;
-    
+
     s_CardDetectSemaphore = xSemaphoreCreateBinary();
 
     sdCardFileSystemReady = false;
@@ -134,7 +133,7 @@ void SdCardThread(void * argument)
     /* SD host init function */
     if (SD_HostInit(&g_sd) != kStatus_Success)
     {
-        //SD host init fail
+        // SD host init fail
         vTaskDelete(NULL);
         return;
     }
@@ -144,6 +143,4 @@ void SdCardThread(void * argument)
     vTaskDelete(NULL);
 }
 
-
 ///////////////////////////////////////////
-

targets/FreeRTOS/NXP/_nanoCLR/Windows.Storage/win_storage_native_target.h

@@ -3,14 +3,13 @@
 // See LICENSE file in the project root for full license information.
 //
 
-
 #ifndef WIN_STORAGE_NATIVE_TARGET_H
 #define WIN_STORAGE_NATIVE_TARGET_H
 
 #include <ff.h>
 #include <corlib_native.h>
 #include "win_storage_native.h"
-#include <nanoHAL_Windows_Storage.h>
+#include <nanoHAL_Persistent_Storage.h>
 #include <Target_Windows_Storage.h>
 
 #endif // WIN_STORAGE_NATIVE_TARGET_H