Release 6.1.12

eclipse-threadx · Jul 26, 2022 · 193598a · 193598a
1 parent bea2597
commit 193598a
Show file tree

Hide file tree

Showing 104 changed files with 1,190 additions and 948 deletions.
diff --git a/addons/BSD/nxd_bsd.c b/addons/BSD/nxd_bsd.c
@@ -13577,7 +13577,7 @@ UINT index = 0;
 /*  FUNCTION                                               RELEASE        */ 
 /*                                                                        */ 
 /*    getaddrinfo                                         PORTABLE C      */ 
-/*                                                           6.1          */
+/*                                                           6.1.12       */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -13638,6 +13638,9 @@ UINT index = 0;
 /*                                            verified memcpy use cases,  */
 /*                                            fixed compiler errors,      */
 /*                                            resulting in version 6.1    */
+/*  07-29-2022     Yuxin Zhou               Modified comment(s), and      */
+/*                                            fixed compiler warnings,    */
+/*                                            resulting in version 6.1.12 */
 /*                                                                        */
 /**************************************************************************/
 INT  getaddrinfo(const CHAR *node, const CHAR *service, const struct addrinfo *hints, struct addrinfo **res)
@@ -13772,7 +13775,7 @@ static struct addrinfo default_hints = {0, AF_UNSPEC, 0, 0, 0, NX_NULL, NX_NULL,
             /* Service is a decimal port number string, and has been converted to a numeric port successfully. */
 
             /* Convert port from host byte order to network byte order. */
-            port = htons(port);
+            port = htons((USHORT)port);
         }
         else
         {

diff --git a/addons/auto_ip/nx_auto_ip.c b/addons/auto_ip/nx_auto_ip.c
@@ -24,14 +24,17 @@
 
 
 /* Force error checking to be disabled in this module */
+#include "tx_port.h"
 
 #ifndef NX_DISABLE_ERROR_CHECKING
 #define NX_DISABLE_ERROR_CHECKING
 #endif
 
+#ifndef TX_SAFETY_CRITICAL
 #ifndef TX_DISABLE_ERROR_CHECKING
 #define TX_DISABLE_ERROR_CHECKING
 #endif
+#endif
 
 
 /* Include necessary system files.  */

diff --git a/addons/azure_iot/azure-sdk-for-c b/addons/azure_iot/azure-sdk-for-c
diff --git a/addons/azure_iot/azure_iot_security_module/configs/RTOS_BASE.dist b/addons/azure_iot/azure_iot_security_module/configs/RTOS_BASE.dist
@@ -4,7 +4,7 @@ CONF_DEFINE_BASE(${g_core_config_path} base_dist.cmake)
 # DIST: overwrite configuration for specific distribution
 set(SECURITY_MODULE_VERSION_MAJOR 3)
 set(SECURITY_MODULE_VERSION_MINOR 5)
-set(SECURITY_MODULE_VERSION_PATCH 2)
+set(SECURITY_MODULE_VERSION_PATCH 3)
 
 set(ASC_COMPONENT_CONFIGURATION OFF)
 

diff --git a/addons/azure_iot/azure_iot_security_module/inc/configs/L4_BASE/asc_config.h b/addons/azure_iot/azure_iot_security_module/inc/configs/L4_BASE/asc_config.h
@@ -21,13 +21,13 @@ extern "C" {
 /********************
 * Core configuration
 *********************/
-/* Based on 2021.09.28-3.5.1 core tag */
+/* Based on 2022.07.19-3.5.3 core tag */
 
 /* ID and version */
 #define ASC_SECURITY_MODULE_ID "defender-iot-micro-agent"
 #define SECURITY_MODULE_VERSION_MAJOR 3
 #define SECURITY_MODULE_VERSION_MINOR 5
-#define SECURITY_MODULE_VERSION_PATCH 2
+#define SECURITY_MODULE_VERSION_PATCH 3
 #ifndef SECURITY_MODULE_VERSION_MAJOR
 #define SECURITY_MODULE_VERSION_MAJOR 0
 #endif

diff --git a/addons/azure_iot/azure_iot_security_module/inc/configs/RTOS_BASE/asc_config.h b/addons/azure_iot/azure_iot_security_module/inc/configs/RTOS_BASE/asc_config.h
@@ -21,13 +21,13 @@ extern "C" {
 /********************
 * Core configuration
 *********************/
-/* Based on 2021.09.28-3.5.1 core tag */
+/* Based on 2022.07.19-3.5.3 core tag */
 
 /* ID and version */
 #define ASC_SECURITY_MODULE_ID "defender-iot-micro-agent"
 #define SECURITY_MODULE_VERSION_MAJOR 3
 #define SECURITY_MODULE_VERSION_MINOR 5
-#define SECURITY_MODULE_VERSION_PATCH 2
+#define SECURITY_MODULE_VERSION_PATCH 3
 #ifndef SECURITY_MODULE_VERSION_MAJOR
 #define SECURITY_MODULE_VERSION_MAJOR 0
 #endif

diff --git a/addons/azure_iot/azure_iot_security_module/inc/configs/RTOS_BASE_UT/asc_config.h b/addons/azure_iot/azure_iot_security_module/inc/configs/RTOS_BASE_UT/asc_config.h
@@ -21,13 +21,13 @@ extern "C" {
 /********************
 * Core configuration
 *********************/
-/* Based on 2021.09.28-3.5.1 core tag */
+/* Based on 2022.07.19-3.5.3 core tag */
 
 /* ID and version */
 #define ASC_SECURITY_MODULE_ID "defender-iot-micro-agent"
 #define SECURITY_MODULE_VERSION_MAJOR 3
 #define SECURITY_MODULE_VERSION_MINOR 5
-#define SECURITY_MODULE_VERSION_PATCH 2
+#define SECURITY_MODULE_VERSION_PATCH 3
 #ifndef SECURITY_MODULE_VERSION_MAJOR
 #define SECURITY_MODULE_VERSION_MAJOR 0
 #endif

diff --git a/addons/azure_iot/azure_iot_security_module/iot-security-module-core/configs/asc_config.h.in b/addons/azure_iot/azure_iot_security_module/iot-security-module-core/configs/asc_config.h.in
@@ -1,7 +1,7 @@
 /********************
 * Core configuration
 *********************/
-/* Based on 2021.09.28-3.5.1 core tag */
+/* Based on 2022.07.19-3.5.3 core tag */
 
 /* ID and version */
 #cmakedefine ASC_SECURITY_MODULE_ID "@ASC_SECURITY_MODULE_ID@"

diff --git a/...e_iot_security_module/iot-security-module-core/deps/flatcc/include/flatcc/flatcc_endian.h b/...e_iot_security_module/iot-security-module-core/deps/flatcc/include/flatcc/flatcc_endian.h
@@ -97,11 +97,11 @@ extern "C" {
 
 /* flatcc/portable/pendian.h sets LITTLE/BIG flags if possible, and always defines le16toh. */
 #ifndef flatbuffers_is_native_pe
-#if defined(__LITTLE_ENDIAN__) || FLATBUFFERS_LITTLEENDIAN
+#if (__LITTLE_ENDIAN__==1) || FLATBUFFERS_LITTLEENDIAN
 #undef FLATBUFFERS_LITTLEENDIAN
 #define FLATBUFFERS_LITTLEENDIAN 1
 #define flatbuffers_is_native_pe() (FLATBUFFERS_PROTOCOL_IS_LE)
-#elif defined(__BIG_ENDIAN__) || (defined(FLATBUFFERS_LITTLEENDIAN) && !FLATBUFFERS_LITTLEENDIAN)
+#elif (__BIG_ENDIAN__==1) || (defined(FLATBUFFERS_LITTLEENDIAN) && !FLATBUFFERS_LITTLEENDIAN)
 #undef FLATBUFFERS_LITTLEENDIAN
 #define FLATBUFFERS_LITTLEENDIAN 0
 #define flatbuffers_is_native_pe() (FLATBUFFERS_PROTOCOL_IS_BE)

diff --git a/...ot_security_module/iot-security-module-core/deps/flatcc/include/flatcc/portable/pendian.h b/...ot_security_module/iot-security-module-core/deps/flatcc/include/flatcc/portable/pendian.h
@@ -131,7 +131,7 @@ extern "C" {
 /* Assume it goes for all. */
 #if !defined(le16toh)
 
-#if defined(__LITTLE_ENDIAN__)
+#if (__LITTLE_ENDIAN__==1)
 
 #define le16toh(v) (v)
 #define le32toh(v) (v)
@@ -149,7 +149,7 @@ extern "C" {
 #define htobe32(v) bswap32(v)
 #define htobe64(v) bswap64(v)
 
-#elif defined(__BIG_ENDIAN__)
+#elif (__BIG_ENDIAN__==1)
 
 #define le16toh(v) bswap16(v)
 #define le32toh(v) bswap32(v)

diff --git a/...rity_module/iot-security-module-core/deps/flatcc/include/flatcc/portable/pendian_detect.h b/...rity_module/iot-security-module-core/deps/flatcc/include/flatcc/portable/pendian_detect.h
@@ -33,19 +33,19 @@ extern "C" {
 
 #ifdef __BYTE_ORDER__
 
-#if defined(__LITTLE_ENDIAN__) && __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
+#if (__LITTLE_ENDIAN__ == 1) && __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
 #error __LITTLE_ENDIAN__ inconsistent with __BYTE_ORDER__
 #endif
 
-#if defined(__BIG_ENDIAN__) && __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
+#if (__BIG_ENDIAN__ == 1) && __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
 #error __BIG_ENDIAN__ inconsistent with __BYTE_ORDER__
 #endif
 
 #else /* __BYTE_ORDER__ */
 
 
 #if                                                                         \
-  defined(__LITTLE_ENDIAN__) ||                                             \
+  (__LITTLE_ENDIAN__ == 1) ||                                               \
   (defined(__BYTE_ORDER) && __BYTE_ORDER == __ORDER_LITTLE_ENDIAN) ||       \
   defined(__ARMEL__) || defined(__THUMBEL__) ||                             \
   defined(__AARCH64EL__) ||                                                 \
@@ -64,7 +64,7 @@ extern "C" {
 #endif
 
 #if                                                                         \
-  defined (__BIG_ENDIAN__) ||                                               \
+  (__BIG_ENDIAN__ == 1) ||                                                  \
   (defined(__BYTE_ORDER) && __BYTE_ORDER == __ORDER_BIG_ENDIAN) ||          \
   defined(__ARMEB__) || defined(THUMBEB__) || defined (__AARCH64EB__) ||    \
   defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__) ||           \
@@ -107,7 +107,7 @@ extern "C" {
 #endif
 #endif /* __BYTE_ORDER__ */
 
-#if defined(__LITTLE_ENDIAN__) && defined(__BIG_ENDIAN__)
+#if (__LITTLE_ENDIAN__ == 1) && (__BIG_ENDIAN__ == 1)
 #error conflicting definitions of __LITTLE_ENDIAN__ and __BIG_ENDIAN__
 #endif
 

diff --git a/addons/azure_iot/nx_azure_iot_hub_client_properties.c b/addons/azure_iot/nx_azure_iot_hub_client_properties.c
@@ -187,7 +187,7 @@ UINT system_component;
         return(NX_AZURE_IOT_INVALID_PARAMETER);
     }
 
-    component_name = az_span_create((UCHAR *)component_name_pptr, (INT)*component_name_length_ptr);
+    component_name = az_span_create((UCHAR *)*component_name_pptr, (INT)*component_name_length_ptr);
     core_message_type = (message_type == NX_AZURE_IOT_HUB_PROPERTIES) ? AZ_IOT_HUB_CLIENT_PROPERTIES_MESSAGE_TYPE_GET_RESPONSE :
                         AZ_IOT_HUB_CLIENT_PROPERTIES_MESSAGE_TYPE_WRITABLE_UPDATED;
     core_property_type = (property_type == NX_AZURE_IOT_HUB_CLIENT_PROPERTY_REPORTED_FROM_DEVICE) ? AZ_IOT_HUB_CLIENT_PROPERTY_REPORTED_FROM_DEVICE :