Merge branch 'main' into fix-chibios-sd-read

nanoframework · Mar 3, 2024 · de2ac69 · de2ac69
2 parents 4c42209 + 95ec74a
commit de2ac69
Show file tree

Hide file tree

Showing 30 changed files with 61 additions and 70 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -160,15 +160,6 @@ if(RTOS_CHIBIOS_CHECK OR RTOS_TI_SIMPLELINK_CHECK)
     unset(LINK_OPTIONS)
     #################################################################
 
-    #################################################################
-    # clear other options and definitions that we want to set
-    unset(COMPILE_OPTIONS)
-    unset(C_COMPILE_OPTIONS)
-    unset(CXX_COMPILE_OPTIONS)
-    unset(COMPILE_DEFINITIONS)
-    unset(LINK_OPTIONS)
-    #################################################################
-
 endif()
 
 #################################################################################

diff --git a/src/HAL/Include/nanoHAL_Boot.h b/src/HAL/Include/nanoHAL_Boot.h
@@ -66,7 +66,7 @@ extern "C"
 
     // Launches the proprietary bootloader of the platform.
     // Returns false in case it's not supported (which is considered the default).
-    // In case of a successfull call it won't return.
+    // In case of a successful call it won't return.
     // Implemented as "weak" to allow it to be replaced with "hard" implementation at platform level.
     bool LaunchProprietaryBootloader();
 
@@ -81,7 +81,7 @@ extern "C"
     // Returns false in case it's not supported (which is considered the default).
     bool RequestToLaunchProprietaryBootloader();
 
-    // Report successfull nanoBooter execution
+    // Report successful nanoBooter execution
     void ReportSuccessfullNanoBooter();
 
 #ifdef __cplusplus

diff --git a/src/HAL/nanoHAL_Boot.c b/src/HAL/nanoHAL_Boot.c
@@ -92,7 +92,7 @@ inline bool RequestToLaunchProprietaryBootloader()
     return false;
 }
 
-// Report successfull nanoBooter execution
+// Report successful nanoBooter execution
 void ReportSuccessfullNanoBooter()
 {
 #if (TARGET_HAS_NANOBOOTER == TRUE)
@@ -107,7 +107,7 @@ void ReportSuccessfullNanoBooter()
 
 // Calls the proprietary bootloader of the platform.
 // Returns false in case it's not supported (which is considered the default).
-// In case of a successfull call it won't return.
+// In case of a successful call it won't return.
 // Implemented as "weak" to allow it to be replaced with "hard" implementation at platform level.
 __nfweak bool LaunchProprietaryBootloader()
 {

diff --git a/src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_Directory.cpp b/src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_Directory.cpp
@@ -204,7 +204,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_Directory::GetFilesNative___STATI
             stringBuffer = (char *)platform_malloc(FF_LFN_BUF + 1);
             workingBuffer = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-            // sanity check for successfull malloc
+            // sanity check for successful malloc
             if (stringBuffer == NULL || workingBuffer == NULL)
             {
                 // failed to allocate memory
@@ -337,7 +337,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_Directory::GetDirectoriesNative__
             stringBuffer = (char *)platform_malloc(FF_LFN_BUF + 1);
             workingBuffer = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-            // sanity check for successfull malloc
+            // sanity check for successful malloc
             if (stringBuffer == NULL || workingBuffer == NULL)
             {
                 // failed to allocate memory

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
@@ -29,7 +29,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_File::ExistsNative___STATIC__BOOL
     // setup file path
     filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-    // sanity check for successfull malloc
+    // sanity check for successful malloc
     if (filePath == NULL)
     {
         // failed to allocate memory

diff --git a/src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_FileStream.cpp b/src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_FileStream.cpp
@@ -40,7 +40,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_FileStream::OpenFileNative___VOID
     // setup file path
     filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-    // sanity check for successfull malloc
+    // sanity check for successful malloc
     if (filePath == NULL)
     {
         // failed to allocate memory
@@ -167,7 +167,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_FileStream::ReadNative___I4__STRI
     // setup file path
     filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-    // sanity check for successfull malloc
+    // sanity check for successful malloc
     if (filePath == NULL)
     {
         // failed to allocate memory
@@ -271,7 +271,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_FileStream::WriteNative___VOID__S
     // setup file path
     filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-    // sanity check for successfull malloc
+    // sanity check for successful malloc
     if (filePath == NULL)
     {
         // failed to allocate memory
@@ -364,7 +364,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_FileStream::GetLengthNative___I8_
     // setup file path
     filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-    // sanity check for successfull malloc
+    // sanity check for successful malloc
     if (filePath == NULL)
     {
         // failed to allocate memory

diff --git a/targets/AzureRTOS/Maxim/MAX78000_FTHR/nanoBooter/main.c b/targets/AzureRTOS/Maxim/MAX78000_FTHR/nanoBooter/main.c
@@ -129,7 +129,7 @@ int main(void)
     // init boot clipboard
     InitBootClipboard();
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 
     // the following IF is not mandatory, it's just providing a way for a user to 'force'

diff --git a/targets/AzureRTOS/Maxim/_common/targetHAL_ConfigurationManager.cpp b/targets/AzureRTOS/Maxim/_common/targetHAL_ConfigurationManager.cpp
@@ -395,7 +395,7 @@ __nfweak bool ConfigurationManager_UpdateConfigurationBlock(
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return TRUE;
             }
 
@@ -426,7 +426,7 @@ __nfweak bool ConfigurationManager_UpdateConfigurationBlock(
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return TRUE;
             }
 
@@ -455,7 +455,7 @@ __nfweak bool ConfigurationManager_UpdateConfigurationBlock(
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return TRUE;
             }
 

diff --git a/targets/AzureRTOS/ST/ORGPAL_PALTHREE/nanoBooter/main.c b/targets/AzureRTOS/ST/ORGPAL_PALTHREE/nanoBooter/main.c
@@ -119,7 +119,7 @@ void tx_application_define(void *first_unused_memory)
     // for nanoBooter we have to init it here to have access to network configuration blocks
     ConfigurationManager_Initialize();
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 }
 

diff --git a/targets/AzureRTOS/ST/ST_B_L475E_IOT01A/nanoBooter/main.c b/targets/AzureRTOS/ST/ST_B_L475E_IOT01A/nanoBooter/main.c
@@ -114,7 +114,7 @@ void tx_application_define(void *first_unused_memory)
         }
     }
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 }
 

diff --git a/targets/AzureRTOS/ST/_common/LaunchCLR.c b/targets/AzureRTOS/ST/_common/LaunchCLR.c
@@ -14,7 +14,7 @@ void LaunchCLR(uint32_t address)
     // function pointer to load nanoCLR ResetHandler address
     irq_vector_t JumpToNanoCLR;
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 
     // load nanoCLR vector table

diff --git a/targets/AzureRTOS/ST/_common/targetHAL_ConfigurationManager.cpp b/targets/AzureRTOS/ST/_common/targetHAL_ConfigurationManager.cpp
@@ -549,7 +549,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -580,7 +580,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -609,7 +609,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -640,7 +640,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 

diff --git a/targets/AzureRTOS/SiliconLabs/SL_STK3701A/nanoBooter/main.c b/targets/AzureRTOS/SiliconLabs/SL_STK3701A/nanoBooter/main.c
@@ -171,7 +171,7 @@ void tx_application_define(void *first_unused_memory)
     usb_device_cdc_acm_app_init();
 #endif
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 }
 

diff --git a/targets/AzureRTOS/SiliconLabs/_common/LaunchCLR.c b/targets/AzureRTOS/SiliconLabs/_common/LaunchCLR.c
@@ -15,7 +15,7 @@ void LaunchCLR(uint32_t address)
     // function pointer to load nanoCLR ResetHandler address
     irq_vector_t JumpToNanoCLR;
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 
     // load nanoCLR vector table

diff --git a/targets/AzureRTOS/SiliconLabs/_common/targetHAL_ConfigurationManager.cpp b/targets/AzureRTOS/SiliconLabs/_common/targetHAL_ConfigurationManager.cpp
@@ -560,7 +560,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -591,7 +591,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -620,7 +620,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -651,7 +651,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 

diff --git a/targets/ChibiOS/ORGPAL_PALTHREE/nanoBooter/main.c b/targets/ChibiOS/ORGPAL_PALTHREE/nanoBooter/main.c
@@ -100,7 +100,7 @@ int main(void)
     // for nanoBooter we have to init it here to have access to network configuration blocks
     ConfigurationManager_Initialize();
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 
     //  Normal main() thread

diff --git a/targets/ChibiOS/ST_NUCLEO64_F091RC/nanoBooter/main.c b/targets/ChibiOS/ST_NUCLEO64_F091RC/nanoBooter/main.c
@@ -71,7 +71,7 @@ int main(void)
     BlockStorageList_Initialize();
     BlockStorage_AddDevices();
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 
     //  Normal main() thread

diff --git a/targets/ChibiOS/ST_STM32F429I_DISCOVERY/nanoBooter/main.c b/targets/ChibiOS/ST_STM32F429I_DISCOVERY/nanoBooter/main.c
@@ -87,7 +87,7 @@ int main(void)
     BlockStorageList_Initialize();
     BlockStorage_AddDevices();
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 
     //  Normal main() thread

diff --git a/targets/ChibiOS/ST_STM32F769I_DISCOVERY/nanoBooter/main.c b/targets/ChibiOS/ST_STM32F769I_DISCOVERY/nanoBooter/main.c
@@ -89,7 +89,7 @@ int main(void)
     // for nanoBooter we have to init it here to have access to network configuration blocks
     ConfigurationManager_Initialize();
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 
     //  Normal main() thread

diff --git a/targets/ChibiOS/_common/LaunchCLR.c b/targets/ChibiOS/_common/LaunchCLR.c
@@ -15,7 +15,7 @@ void LaunchCLR(uint32_t address)
     // function pointer to load nanoCLR ResetHandler address
     irq_vector_t JumpToNanoCLR;
 
-    // report successfull nanoBooter execution
+    // report successful nanoBooter execution
     ReportSuccessfullNanoBooter();
 
     // load nanoCLR vector table

diff --git a/targets/ChibiOS/_common/targetHAL_ConfigurationManager.cpp b/targets/ChibiOS/_common/targetHAL_ConfigurationManager.cpp
@@ -476,7 +476,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -507,7 +507,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -536,7 +536,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 
@@ -567,7 +567,7 @@ __nfweak UpdateConfigurationResult ConfigurationManager_UpdateConfigurationBlock
                 // free memory
                 platform_free(configSectorCopy);
 
-                // operation is successfull (nothing to update)
+                // operation is successful (nothing to update)
                 return UpdateConfigurationResult_NoChanges;
             }
 

diff --git a/...ets/ChibiOS/_nanoCLR/System.Device.I2c/sys_dev_i2c_native_System_Device_I2c_I2cDevice.cpp b/...ets/ChibiOS/_nanoCLR/System.Device.I2c/sys_dev_i2c_native_System_Device_I2c_I2cDevice.cpp
@@ -648,7 +648,7 @@ HRESULT Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::
             }
             else
             {
-                // successfull transaction
+                // successful transaction
                 // set the result field
                 result[I2cTransferResult::FIELD___status].SetInteger((CLR_UINT32)I2cTransferStatus_FullTransfer);
 

diff --git a/targets/ESP32/_nanoCLR/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_Directory.cpp b/targets/ESP32/_nanoCLR/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_Directory.cpp
@@ -239,7 +239,7 @@ HRESULT BuildPathsArray(const char *vfsFolderPath, const char *folderPath, CLR_R
         stringBuffer = (char *)platform_malloc(FF_LFN_BUF + 1);
         workingBuffer = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-        // sanity check for successfull malloc
+        // sanity check for successful malloc
         if (stringBuffer == NULL || workingBuffer == NULL)
         {
             // failed to allocate memory

diff --git a/targets/ESP32/_nanoCLR/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_File.cpp b/targets/ESP32/_nanoCLR/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_File.cpp
@@ -42,7 +42,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_File::ExistsNative___STATIC__BOOL
     // setup file path
     filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
 
-    // sanity check for successfull malloc
+    // sanity check for successful malloc
     if (filePath == NULL)
     {
         // failed to allocate memory