Add Support for Storage Operations (#2901)

nanoframework · Mar 21, 2024 · e79c5fa · e79c5fa
1 parent aa74772
commit e79c5fa
Show file tree

Hide file tree

Showing 48 changed files with 616 additions and 149 deletions.
diff --git a/CMake/AzureRTOS_target_os.h.in b/CMake/AzureRTOS_target_os.h.in
@@ -27,6 +27,7 @@
 #define DP_FLOATINGPOINT                    @TARGET_DP_FLOATINGPOINT@
 #define SUPPORT_ANY_BASE_CONVERSION         @TARGET_SUPPORT_ANY_BASE_CONVERSION@
 #define HAS_CONFIG_BLOCK                    @TARGET_HAS_CONFIG_BLOCK@
+#define HAS_ACCESSIBLE_STORAGE              @TARGET_HAS_ACCESSIBLE_STORAGE@
 #define NANOCLR_REFLECTION                  @TARGET_NANOCLR_REFLECTION@
 #define NANOCLR_SYSTEM_COLLECTIONS          @TARGET_SYSTEM_COLLECTIONS@
 #define TARGET_HAS_NANOBOOTER               @TARGET_HAS_NANOBOOTER@

diff --git a/CMake/ChibiOS_target_os.h.in b/CMake/ChibiOS_target_os.h.in
@@ -27,6 +27,7 @@
 #define DP_FLOATINGPOINT                    @TARGET_DP_FLOATINGPOINT@
 #define SUPPORT_ANY_BASE_CONVERSION         @TARGET_SUPPORT_ANY_BASE_CONVERSION@
 #define HAS_CONFIG_BLOCK                    @TARGET_HAS_CONFIG_BLOCK@
+#define HAS_ACCESSIBLE_STORAGE              @TARGET_HAS_ACCESSIBLE_STORAGE@
 #define NANOCLR_REFLECTION                  @TARGET_NANOCLR_REFLECTION@
 #define NANOCLR_SYSTEM_COLLECTIONS          @TARGET_SYSTEM_COLLECTIONS@
 #define TARGET_HAS_NANOBOOTER               @TARGET_HAS_NANOBOOTER@

diff --git a/CMake/ESP32_target_os.h.in b/CMake/ESP32_target_os.h.in
@@ -24,6 +24,7 @@
 #define DP_FLOATINGPOINT                    @TARGET_DP_FLOATINGPOINT@
 #define SUPPORT_ANY_BASE_CONVERSION         @TARGET_SUPPORT_ANY_BASE_CONVERSION@
 #define HAS_CONFIG_BLOCK                    @TARGET_HAS_CONFIG_BLOCK@
+#define HAS_ACCESSIBLE_STORAGE              @TARGET_HAS_ACCESSIBLE_STORAGE@
 #define NANOCLR_REFLECTION                  @TARGET_NANOCLR_REFLECTION@
 #define NANOCLR_SYSTEM_COLLECTIONS          @TARGET_SYSTEM_COLLECTIONS@
 #define TARGET_HAS_NANOBOOTER               FALSE

diff --git a/CMake/FreeRTOS_target_os.h.in b/CMake/FreeRTOS_target_os.h.in
@@ -25,6 +25,7 @@
 #define DP_FLOATINGPOINT                    @TARGET_DP_FLOATINGPOINT@
 #define SUPPORT_ANY_BASE_CONVERSION         @TARGET_SUPPORT_ANY_BASE_CONVERSION@
 #define HAS_CONFIG_BLOCK                    @TARGET_HAS_CONFIG_BLOCK@
+#define HAS_ACCESSIBLE_STORAGE              @TARGET_HAS_ACCESSIBLE_STORAGE@
 #define NANOCLR_REFLECTION                  @TARGET_NANOCLR_REFLECTION@
 #define NANOCLR_SYSTEM_COLLECTIONS          @TARGET_SYSTEM_COLLECTIONS@
 #define TARGET_HAS_NANOBOOTER               @TARGET_HAS_NANOBOOTER@

diff --git a/CMake/TI_SimpleLink_target_os.h.in b/CMake/TI_SimpleLink_target_os.h.in
@@ -20,6 +20,7 @@
 #define DP_FLOATINGPOINT                    @TARGET_DP_FLOATINGPOINT@
 #define SUPPORT_ANY_BASE_CONVERSION         @TARGET_SUPPORT_ANY_BASE_CONVERSION@
 #define HAS_CONFIG_BLOCK                    @TARGET_HAS_CONFIG_BLOCK@
+#define HAS_ACCESSIBLE_STORAGE              @TARGET_HAS_ACCESSIBLE_STORAGE@
 #define NANOCLR_REFLECTION                  @TARGET_NANOCLR_REFLECTION@
 #define NANOCLR_SYSTEM_COLLECTIONS          @TARGET_SYSTEM_COLLECTIONS@
 #define TARGET_HAS_NANOBOOTER               FALSE

diff --git a/CMake/binutils.ChibiOS.cmake b/CMake/binutils.ChibiOS.cmake
@@ -235,6 +235,8 @@ macro(nf_add_platform_include_directories target)
         ${TARGET_CMSIS_COMMON_INCLUDE_DIRS}
         ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS}
         ${lWIP_INCLUDE_DIRS}
+        ${SPIFFS_INCLUDE_DIRS}
+
     )
 
     # includes specific to nanoBooter
@@ -243,7 +245,6 @@ macro(nf_add_platform_include_directories target)
         target_include_directories(${target}.elf PUBLIC
 
             ${TARGET_CHIBIOS_NANOBOOTER_INCLUDE_DIRS}
-
         )
 
     endif()

diff --git a/CMake/xtensa-esp32.json b/CMake/xtensa-esp32.json
@@ -20,6 +20,7 @@
                 "TARGET_SERIES": "ESP32",
                 "TARGET_BOARD": "ESP32",
                 "NF_FEATURE_HAS_CONFIG_BLOCK": "ON",
+                "NF_FEATURE_HAS_ACCESSIBLE_STORAGE": "ON",
                 "SUPPORT_ANY_BASE_CONVERSION": "ON",
                 "API_System.Net": "ON",
                 "API_System.Math": "ON",

diff --git a/CMake/xtensa-esp32c3.json b/CMake/xtensa-esp32c3.json
@@ -20,6 +20,7 @@
                 "TARGET_SERIES": "ESP32_C3",
                 "TARGET_BOARD": "ESP32_C3",
                 "NF_FEATURE_HAS_CONFIG_BLOCK": "ON",
+                "NF_FEATURE_HAS_ACCESSIBLE_STORAGE": "ON",
                 "SUPPORT_ANY_BASE_CONVERSION": "ON",
                 "API_System.Net": "ON",
                 "API_System.Math": "ON",

diff --git a/CMake/xtensa-esp32s2.json b/CMake/xtensa-esp32s2.json
@@ -20,6 +20,7 @@
                 "TARGET_SERIES": "ESP32_S2",
                 "TARGET_BOARD": "ESP32_S2",
                 "NF_FEATURE_HAS_CONFIG_BLOCK": "ON",
+                "NF_FEATURE_HAS_ACCESSIBLE_STORAGE": "ON",
                 "SUPPORT_ANY_BASE_CONVERSION": "ON",
                 "API_System.Net": "ON",
                 "API_System.Math": "ON",

diff --git a/CMake/xtensa-esp32s3.json b/CMake/xtensa-esp32s3.json
@@ -20,6 +20,7 @@
                 "TARGET_SERIES": "ESP32_S3",
                 "TARGET_BOARD": "ESP32_S3",
                 "NF_FEATURE_HAS_CONFIG_BLOCK": "ON",
+                "NF_FEATURE_HAS_ACCESSIBLE_STORAGE": "ON",
                 "SUPPORT_ANY_BASE_CONVERSION": "ON",
                 "API_System.Net": "ON",
                 "API_System.Math": "ON",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -287,6 +287,19 @@ else()
     message(STATUS "Configuration block storage **IS NOT** included")
 endif()
 
+#################################################################
+# enables internal storage support
+# (default is OFF so Accessible Storage Feature is NOT supported)
+option(NF_FEATURE_HAS_ACCESSIBLE_STORAGE "option to enable accessible storage")
+
+if(NF_FEATURE_HAS_ACCESSIBLE_STORAGE)
+    set(TARGET_HAS_ACCESSIBLE_STORAGE TRUE CACHE INTERNAL "Option for accessible storage")
+    message(STATUS "Accessible Storage feature is included")
+else()
+    set(TARGET_HAS_ACCESSIBLE_STORAGE FALSE CACHE INTERNAL "Option for accessible storage")
+    message(STATUS "Accessible Storage feature **IS NOT** included")
+endif()
+
 #################################################################
 # enables support for SD Card
 # (default is OFF so SD Card is NOT supported)

diff --git a/src/CLR/Debugger/Debugger.cpp b/src/CLR/Debugger/Debugger.cpp
@@ -12,6 +12,7 @@
 #include "Debugger.h"
 #include <corlib_native.h>
 #include <target_common.h>
+#include <nanoHAL_StorageOperation.h>
 
 #define __min(a, b) (((a) < (b)) ? (a) : (b))
 
@@ -1335,6 +1336,27 @@ bool CLR_DBG_Debugger::Monitor_UpdateConfiguration(WP_Message *message)
 #endif
 }
 
+bool CLR_DBG_Debugger::Monitor_StorageOperation(WP_Message *message)
+{
+    NATIVE_PROFILE_CLR_DEBUGGER();
+
+#if (HAS_ACCESSIBLE_STORAGE == TRUE)
+
+    Monitor_StorageOperation_Command *cmd = (Monitor_StorageOperation_Command *)message->m_payload;
+    Monitor_StorageOperation_Reply cmdReply;
+
+    cmdReply.ErrorCode = HAL_StorageOperation(cmd->Operation, cmd->NameLength, cmd->DataLength, cmd->Offset, cmd->Data);
+
+    WP_ReplyToCommand(message, true, false, &cmdReply, sizeof(cmdReply));
+
+    return true;
+
+#endif
+
+    (void)message;
+    return false;
+}
+
 //--//
 
 bool CLR_DBG_Debugger::Debugging_Execution_BasePtr(WP_Message *msg)