nanoframework · networkfusion · Feb 7, 2025 · Feb 7, 2025 · Feb 7, 2025 · Feb 7, 2025
diff --git a/CMake/Modules/FindNF_NativeAssemblies.cmake b/CMake/Modules/FindNF_NativeAssemblies.cmake
@@ -29,7 +29,6 @@ option(API_System.Device.Pwm                            "option for System.Devic
 option(API_System.IO.Ports                              "option for System.IO.Ports API")
 option(API_System.Device.Spi                            "option for System.Device.Spi API")
 option(API_System.Runtime.Serialization                 "option for System.Runtime.Serialization API")
-option(API_Windows.Storage                              "option for Windows.Storage")
 option(API_nanoFramework.Graphics                       "option for nanoFramework.Graphics")
 option(API_nanoFramework.Device.Bluetooth               "option for nanoFramework.Device.Bluetooth")
 option(API_System.Device.UsbStream                      "option for System.Device.UsbStream API")
@@ -453,12 +452,6 @@ if(API_System.Device.UsbStream)
     PerformSettingsForApiEntry("System.Device.UsbStream")
 endif()
 
-# Windows.Storage
-if(API_Windows.Storage)
-    ##### API name here (doted name)
-    PerformSettingsForApiEntry("Windows.Storage")
-endif()
-
 # Interop assemblies
 ParseInteropAssemblies()
 

diff --git a/CMake/Modules/FindSystem.IO.FileSystem.cmake b/CMake/Modules/FindSystem.IO.FileSystem.cmake
@@ -8,6 +8,7 @@ set(BASE_PATH_FOR_THIS_MODULE ${BASE_PATH_FOR_CLASS_LIBRARIES_MODULES}/System.IO
 
 if(RTOS_FREERTOS_CHECK)
     set(PROJECT_COMMON_PATH ${PROJECT_SOURCE_DIR}/targets/FreeRTOS/NXP/_common)
+    set(FATFS_PLATFORM ${PROJECT_SOURCE_DIR}/targets/FreeRTOS/NXP/_FatFs)
 else()
     set(PROJECT_COMMON_PATH ${PROJECT_SOURCE_DIR}/targets/${RTOS}/_common)
 endif()
@@ -75,6 +76,7 @@ foreach(SRC_FILE ${System.IO.FileSystem_SRCS})
 
             # FatFs
             ${CMAKE_SOURCE_DIR}/targets/${RTOS}/_FatFs
+            ${FATFS_PLATFORM}
 
 	    CMAKE_FIND_ROOT_PATH_BOTH
     )

diff --git a/CMake/Modules/FindWindows.Storage.cmake b/CMake/Modules/FindWindows.Storage.cmake
diff --git a/CMake/Modules/FreeRTOS_IMXRT10xx_GCC_options.cmake b/CMake/Modules/FreeRTOS_IMXRT10xx_GCC_options.cmake
@@ -33,8 +33,6 @@ macro(nf_set_compile_options)
     # this series has FPU 
     target_compile_definitions(${NFSCO_TARGET} PUBLIC -DPLATFORM_ARM -DCORTEX_USE_FPU=TRUE -DUSE_FPU=TRUE) 
 
-    # temporarily force inclusion of Windows Storage headers
-    target_compile_definitions(${NFSCO_TARGET} PUBLIC -DINCLUDE_WINDOWS_STORAGE)
 endmacro()
 
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -309,16 +309,11 @@ if(NF_FEATURE_HAS_SDCARD)
 
     # this feature currently is supported only on ChibiOS, iMX.RT FreeRTOS and ESP32 FreeRTOS
     if(NOT RTOS_CHIBIOS_CHECK AND NOT RTOS_FREERTOS_CHECK AND NOT RTOS_ESP32_CHECK)
-        message(FATAL_ERROR "Support for SD Card is only available for ChibiOS Cortex-M targets, iMX.RT FreeRTOS and ESP32 targets..")
+        message(FATAL_ERROR "Support for SD Card is only available for ChibiOS Cortex-M targets, iMX.RT FreeRTOS and ESP32 targets.")
     endif()
 
-    if(RTOS_FREERTOS_CHECK)
-        # ONLY FOR FREERTOS+NXP force inclusion of Windows.Storage API
-        set(API_Windows.Storage ON CACHE INTERNAL "Forcing Windows.Storage API option to ON")
-    else()
-        # all the others RTOSes: force inclusion of System.IO.FileSystem API
-        set(API_System.IO.FileSystem ON CACHE INTERNAL "Forcing System.IO.FileSystem API option to ON")
-    endif()
+    # all RTOSes: force inclusion of System.IO.FileSystem API
+    set(API_System.IO.FileSystem ON CACHE INTERNAL "Forcing System.IO.FileSystem API option to ON")
 
     message(STATUS "Support for SD Card is included")
 
@@ -668,7 +663,6 @@ if( API_nanoFramework.Device.OneWire OR
     API_System.Device.Gpio OR
     API_System.IO.Ports OR
     API_nanoFramework.Device.Can OR
-    API_Windows.Storage OR
     API_System.IO.FileSystem)
 
     # these APIs requires nanoFramework.Runtime.Events

diff --git a/src/HAL/Include/nanoHAL_System_IO_FileSystem.h b/src/HAL/Include/nanoHAL_System_IO_FileSystem.h
@@ -48,18 +48,6 @@ typedef enum StorageEventType
 #define DRIVE_LETTER_LENGTH sizeof(INDEX0_DRIVE_LETTER)
 #define DRIVE_PATH_LENGTH   sizeof(INDEX0_DRIVE_PATH)
 
-/////////////////////////////////////////////////////////////////////////////////////////
-// !!! KEEP IN SYNC WITH Windows.Storage.CreationCollisionOption (in managed code) !!! //
-/////////////////////////////////////////////////////////////////////////////////////////
-
-enum CreationCollisionOption
-{
-    CreationCollisionOption_GenerateUniqueName = 0,
-    CreationCollisionOption_ReplaceExisting,
-    CreationCollisionOption_FailIfExists,
-    CreationCollisionOption_OpenIfExists
-};
-
 #ifdef __cplusplus
 extern "C"
 {

diff --git a/src/HAL/Include/nanoHAL_Windows_Storage.h b/src/HAL/Include/nanoHAL_Windows_Storage.h
diff --git a/src/HAL/Include/nanoHAL_v2.h b/src/HAL/Include/nanoHAL_v2.h
@@ -414,10 +414,6 @@ extern "C"
 #include <nanoHAL_Watchdog.h>
 #include <nanoHAL_Rtos.h>
 
-#ifdef INCLUDE_WINDOWS_STORAGE
-#include <nanoHAL_Windows_Storage.h>
-#else
 #include <nanoHAL_System_IO_FileSystem.h>
-#endif
 
 #endif // NANOHAL_V2_H
diff --git a/src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_File.cpp b/src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_File.cpp
@@ -6,7 +6,6 @@
 #include "nf_sys_io_filesystem.h"
 
 #include <ff.h>
-#include <nanoHAL_Windows_Storage.h>
 
 extern SYSTEMTIME GetDateTime(uint16_t date, uint16_t time);
 extern void CombinePathAndName(char *outpath, const char *path1, const char *path2);