Merge branch 'main' into devcontainer-structure-4

Author: networkfusion

.devcontainer/All/Dockerfile.All.SRC

@@ -74,7 +74,7 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
     && git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
 
 # Clone repos for AzureRTOS
-RUN git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
+RUN git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
     && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
 
 # Clone dependent repos (mbedtls, fatfs and spiffs)

.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC

@@ -63,8 +63,8 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7
 
 # Clone repos for AzureRTOS
-RUN git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
-    && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
+RUN git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
+    && git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
 
 # Clone dependent repos (mbedtls, fatfs and spiffs)
 RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \

CMake/Modules/FindGecko_SDK.cmake

@@ -47,6 +47,8 @@ list(APPEND Gecko_SDK_INCLUDE_DIRS ${gecko_sdk_SOURCE_DIR}/platform/service/slee
 list(APPEND Gecko_SDK_INCLUDE_DIRS ${gecko_sdk_SOURCE_DIR}/platform/emdrv/uartdrv/inc)
 list(APPEND Gecko_SDK_INCLUDE_DIRS ${gecko_sdk_SOURCE_DIR}/platform/service/udelay/inc)
 list(APPEND Gecko_SDK_INCLUDE_DIRS ${gecko_sdk_SOURCE_DIR}/platform/driver/i2cspm/inc)
+list(APPEND Gecko_SDK_INCLUDE_DIRS ${gecko_sdk_SOURCE_DIR}/platform/security/sl_component/sl_psa_driver/inc)
+list(APPEND Gecko_SDK_INCLUDE_DIRS ${gecko_sdk_SOURCE_DIR}/util/third_party/mbedtls/include)
 
 if(GECKO_FEATURE_USBD_HID OR 
    HAL_WP_USE_USB_CDC OR
@@ -127,6 +129,7 @@ set(gecko_sdk_srcs
     sl_event_handler.c
     sl_board_default_init_stub.c
     sl_i2cspm_init.c
+    sli_crypto_trng_driver.c
     # candidate for replacement with RTOS friendly version
     sl_i2cspm.c
     sl_string.c
@@ -224,6 +227,7 @@ if("${TARGET_SERIES}" STREQUAL "EFM32GG11")
             ${gecko_sdk_SOURCE_DIR}/platform/service/sleeptimer/src
             ${gecko_sdk_SOURCE_DIR}/platform/service/system/src
             ${gecko_sdk_SOURCE_DIR}/platform/service/udelay/src
+            ${gecko_sdk_SOURCE_DIR}/platform/security/sl_component/sl_psa_driver/src            
             ${gecko_sdk_SOURCE_DIR}/platform/driver/i2cspm/src
             ${gecko_sdk_SOURCE_DIR}/util/silicon_labs/silabs_core/memory_manager
 
@@ -303,6 +307,7 @@ macro(nf_add_gecko_sdk)
 
     nf_set_compile_options(TARGET ${LIB_NAME} BUILD_TARGET ${NFGCKSDK_BUILD_TARGET})
     nf_set_compile_definitions(TARGET ${LIB_NAME} EXTRA_COMPILE_DEFINITIONS ${NFGCKSDK_EXTRA_COMPILE_DEFINITIONS} BUILD_TARGET ${NFGCKSDK_BUILD_TARGET})
+    nf_set_compile_definitions(TARGET ${LIB_NAME} EXTRA_COMPILE_DEFINITIONS MBEDTLS_ENTROPY_HARDWARE_ALT BUILD_TARGET ${NFGCKSDK_BUILD_TARGET})
 
     # add compile definitions required for WinUSB
     if(GECKO_FEATURE_USBD_WINUSB)

VisualStudioDevelopment/CopyBuildOutput.cmd

@@ -48,7 +48,15 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     Library_sys_net_native_System_Net_NetworkInformation_NetworkInterface::GetNetworkInterfaceCount___STATIC__I4,
     Library_sys_net_native_System_Net_NetworkInformation_NetworkInterface::GetNetworkInterface___STATIC__SystemNetNetworkInformationNetworkInterface__U4,
-    Library_sys_net_native_System_Net_NetworkInformation_NetworkInterface::IPAddressFromString___STATIC__I8__STRING,
+    Library_sys_net_native_System_Net_NetworkInformation_NetworkInterface::IPV4AddressFromString___STATIC__I8__STRING,
+    Library_sys_net_native_System_Net_NetworkInformation_NetworkInterface::IPV6AddressFromString___STATIC__SZARRAY_U2__STRING,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
     NULL,
     NULL,
     NULL,
@@ -85,6 +93,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     NULL,
     NULL,
     Library_sys_net_native_System_Net_IPAddress::IPv4ToString___STATIC__STRING__U4,
+    Library_sys_net_native_System_Net_IPAddress::IPv6ToString___STATIC__STRING__SZARRAY_U2,
     NULL,
     NULL,
     NULL,
@@ -333,9 +342,8 @@ static const CLR_RT_MethodHandler method_lookup[] =
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_System_Net =
 {
     "System.Net",
-    0x5BAB8CB3,
+    0xA6875261,
     method_lookup,
-    { 100, 1, 5, 0 }
+    { 100, 2, 0, 0 }
 };
-
 // clang-format on

VisualStudioDevelopment/README.md

@@ -137,7 +137,8 @@ struct Library_sys_net_native_System_Net_NetworkInformation_NetworkInterface
     NANOCLR_NATIVE_DECLARE(GetIsNetworkAvailable___STATIC__BOOLEAN);
     NANOCLR_NATIVE_DECLARE(GetNetworkInterfaceCount___STATIC__I4);
     NANOCLR_NATIVE_DECLARE(GetNetworkInterface___STATIC__SystemNetNetworkInformationNetworkInterface__U4);
-    NANOCLR_NATIVE_DECLARE(IPAddressFromString___STATIC__I8__STRING);
+    NANOCLR_NATIVE_DECLARE(IPV4AddressFromString___STATIC__I8__STRING);
+    NANOCLR_NATIVE_DECLARE(IPV6AddressFromString___STATIC__SZARRAY_U2__STRING);
 
     //--//
 };
@@ -160,12 +161,16 @@ struct Library_sys_net_native_System_Net_IPAddress
 {
     static const int FIELD_STATIC__Any = 8;
     static const int FIELD_STATIC__Loopback = 9;
+    static const int FIELD_STATIC__IPv6Any = 10;
+    static const int FIELD_STATIC__IPv6Loopback = 11;
 
     static const int FIELD__Address = 1;
     static const int FIELD___family = 2;
     static const int FIELD___numbers = 3;
+    static const int FIELD___scopeid = 4;
 
     NANOCLR_NATIVE_DECLARE(IPv4ToString___STATIC__STRING__U4);
+    NANOCLR_NATIVE_DECLARE(IPv6ToString___STATIC__STRING__SZARRAY_U2);
 
     //--//
 };

VisualStudioDevelopment/VSDevDirectoryStructure.png

@@ -9,12 +9,25 @@ HRESULT Library_sys_net_native_System_Net_IPAddress::IPv4ToString___STATIC__STRI
 {
     NANOCLR_HEADER();
 
-    // // get IP v4 address in numeric format
-    // const ip4_addr_t ip4Address = {stack.Arg0().NumericByRef().u4};
+    // get IP v4 address in numeric format
+    NANOCLR_CHECK_HRESULT(stack.SetResult_String(SOCK_IPV4AddressToString(stack.Arg0().NumericByRef().u4)));
 
-    // NANOCLR_CHECK_HRESULT(stack.SetResult_String(ip4addr_ntoa(&ip4Address)));
+    NANOCLR_NOCLEANUP();
+}
+
+HRESULT Library_sys_net_native_System_Net_IPAddress::IPv6ToString___STATIC__STRING__SZARRAY_U2(CLR_RT_StackFrame &stack)
+{
+    NANOCLR_HEADER();
+
+#if defined(LWIP_IPV6) && LWIP_IPV6
+    // Get address of ushort array with ipv6 address
+    CLR_UINT16 *addr = (CLR_UINT16 *)stack.Arg0().DereferenceArray()->GetFirstElement();
 
-    NANOCLR_CHECK_HRESULT(stack.SetResult_String(SOCK_IPAddressToString(stack.Arg0().NumericByRef().u4)));
+    // get IP v6 address in numeric format
+    NANOCLR_CHECK_HRESULT(stack.SetResult_String(SOCK_IPV6AddressToString(addr)));
+#else
+    NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub());
+#endif
 
     NANOCLR_NOCLEANUP();
 }

src/DeviceInterfaces/System.Net/sys_net_native.cpp

@@ -13,3 +13,12 @@ HRESULT Library_sys_net_native_System_Net_IPAddress::IPv4ToString___STATIC__STRI
 
     NANOCLR_NOCLEANUP();
 }
+
+HRESULT Library_sys_net_native_System_Net_IPAddress::IPv6ToString___STATIC__STRING__SZARRAY_U2(CLR_RT_StackFrame &stack)
+{
+    NANOCLR_HEADER();
+
+    NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub());
+
+    NANOCLR_NOCLEANUP();
+}