Merge tag 'v6.2.1_rel' into fsp_azure_iot_include_order_fix

renesas · Mar 10, 2023 · d66a4df · d66a4df
2 parents da3a2a4 + 068a949
commit d66a4df
Show file tree

Hide file tree

Showing 160 changed files with 3,038 additions and 628 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve Azure RTOS.
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+Please also mention any information which could help others to understand
+the problem you're facing:
+- What target device are you using?
+- Which version of Azure RTOS?
+- What toolchain and environment?
+- What have you tried to diagnose or workaround this issue?
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Build my project in IAR Workbench.
+1. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Impact**
+What impact does this issue have on your progress (e.g., annoyance, showstopper)
+
+**Logs and console output**
+If applicable, add console logs or other types of debug information like Wireshark capture as `.zip` file.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea or enhancement to existing feature for Azure RTOS.
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/hardware-or-architecture-support.md b/.github/ISSUE_TEMPLATE/hardware-or-architecture-support.md
@@ -0,0 +1,19 @@
+---
+name: Hardware or architecture support
+about: Suggest adding hardware or new architecture support.
+title: ''
+labels: hardware
+assignees: ''
+
+---
+
+**Is this request related to a particular hardware platform, SoC, board? Please describe.**
+Describe in details the hardware support being requested and why this support benefits Azure RTOS.
+
+**Describe why you are asking for this support?**
+Describe why you are asking for this support.
+
+If this is a new board or SoC, please state whether you are willing to maintain the Azure RTOS support together with you.
+
+**Additional context**
+Add any other context or graphics (drag-and-drop an image) about the hardware here.
diff --git a/LICENSED-HARDWARE.txt b/LICENSED-HARDWARE.txt
@@ -1,6 +1,6 @@
 LICENSED HARDWARE LIST
 
-Last Updated: 2021-04-01
+Last Updated: 2023-02-10
 
 Microsoft has entered into OEM Agreements with manufacturers of the following
 microprocessors and microcontrollers (the “hardware”) to enable those
@@ -31,14 +31,14 @@ NXP:
 
     i.MX RT10xx and RT116x/7x series crossover MCUs
     LPC5500 series
-
+    MCX N series
 
 Renesas:
 
     Synergy Platform
     RX Family of MCUs
     RA Family of MCUs
-    RZ Family of MPUs
+    RZ/A, RZ/N and RZ/T Family of MPUs
 
 --------------------------------------------------------------------------------
 

diff --git a/README.md b/README.md
@@ -38,6 +38,53 @@ Also there is dedicated [learning path of Azure RTOS NetX Duo](https://learn.mic
 
 The master branch has the most recent code with all new features and bug fixes. It does not represent the latest General Availability (GA) release of the library. Each official release (preview or GA) will be tagged to mark the commit and push it into the Github releases tab, e.g. `v6.2-rel`.
 
+> When you see xx-xx-xxxx, 6.x or x.x in function header, this means the file is not officially released yet. They will be updated in the next release. See example below.
+```
+/**************************************************************************/
+/*                                                                        */
+/*  FUNCTION                                               RELEASE        */
+/*                                                                        */
+/*    _tx_initialize_low_level                          Cortex-M23/GNU    */
+/*                                                           6.x          */
+/*  AUTHOR                                                                */
+/*                                                                        */
+/*    Scott Larson, Microsoft Corporation                                 */
+/*                                                                        */
+/*  DESCRIPTION                                                           */
+/*                                                                        */
+/*    This function is responsible for any low-level processor            */
+/*    initialization, including setting up interrupt vectors, setting     */
+/*    up a periodic timer interrupt source, saving the system stack       */
+/*    pointer for use in ISR processing later, and finding the first      */
+/*    available RAM memory address for tx_application_define.             */
+/*                                                                        */
+/*  INPUT                                                                 */
+/*                                                                        */
+/*    None                                                                */
+/*                                                                        */
+/*  OUTPUT                                                                */
+/*                                                                        */
+/*    None                                                                */
+/*                                                                        */
+/*  CALLS                                                                 */
+/*                                                                        */
+/*    None                                                                */
+/*                                                                        */
+/*  CALLED BY                                                             */
+/*                                                                        */
+/*    _tx_initialize_kernel_enter           ThreadX entry function        */
+/*                                                                        */
+/*  RELEASE HISTORY                                                       */
+/*                                                                        */
+/*    DATE              NAME                      DESCRIPTION             */
+/*                                                                        */
+/*  09-30-2020      Scott Larson            Initial Version 6.1           */
+/*  xx-xx-xxxx      Scott Larson            Include tx_user.h,            */
+/*                                            resulting in version 6.x    */
+/*                                                                        */
+/**************************************************************************/ 
+```
+
 ## Protocols and connectivity
 
 Protocols and connectivity support are provided as addon modules within NetX Duo in `addons` folder. Some key modules are: [**azure_iot**](https://github.com/azure-rtos/netxduo/tree/master/addons/azure_iot), [**dhcp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dhcp-client/chapter1), [**dns**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dns/chapter1), [**ftp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-dns/chapter1), [**http**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-http/chapter1), [**mqtt**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-mqtt/chapter1), [**pop3**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-pop3-client/chapter1), [**lwm2m**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-lwm2m/chapter1), [**ppp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-ppp/chapter1), [**sntp**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-sntp-client/chapter1), and [**web**](https://learn.microsoft.com/azure/rtos/netx-duo/netx-duo-web-http/chapter1). For a full list of NetX Duo addons, you can find in the same [Azure RTOS NetX Duo documentation](https://learn.microsoft.com/azure/rtos/netx-duo/).

diff --git a/addons/BSD/nxd_bsd.c b/addons/BSD/nxd_bsd.c
@@ -5266,7 +5266,7 @@ NX_BSD_SOCKET   *bsd_socket_ptr;
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    ioctl                                               PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.2.1        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -5308,6 +5308,9 @@ NX_BSD_SOCKET   *bsd_socket_ptr;
 /*  05-19-2020     Yuxin Zhou               Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  03-08-2023     Wenhui Xie               Modified comment(s), corrected*/
+/*                                            the result of FIONREAD,     */
+/*                                            resulting in version 6.2.1  */
 /*                                                                        */
 /**************************************************************************/
 INT  ioctl(INT sockID,  INT command, INT *result)
@@ -5386,6 +5389,10 @@ UINT                status;
                     NX_BSD_ERROR(NX_BSD_MUTEX_ERROR, __LINE__);
                     return(NX_SOC_ERROR); 
                 }
+                else
+                {
+                    *result += (INT)(bsd_socket_ptr -> nx_bsd_socket_received_byte_count);
+                }
             }
             else if (udp_socket_ptr)
             {

diff --git a/addons/azure_iot/README.md b/addons/azure_iot/README.md
@@ -95,12 +95,12 @@ So the total additional connection traffic will be:
 
 ## APIs
 
-* [nx_azure_iot](./azure_rtos_iot.md)    
-* [nx_azure_iot_hub_client](./azure_rtos_iot_hub_client.md)
-* [nx_azure_iot_hub_client_properties](./azure_rtos_iot_hub_client_properties.md)
-* [nx_azure_iot_provisioning_client](./azure_rtos_iot_provisioning_client.md)
-* [nx_azure_iot_json](./azure_rtos_iot_json.md)
-* [nx_azure_iot_adu_agent](./azure_rtos_iot_adu_agent.md)
+* [nx_azure_iot](./docs/azure_rtos_iot.md)    
+* [nx_azure_iot_hub_client](./docs/azure_rtos_iot_hub_client.md)
+* [nx_azure_iot_hub_client_properties](./docs/azure_rtos_iot_hub_client_properties.md)
+* [nx_azure_iot_provisioning_client](./docs/azure_rtos_iot_provisioning_client.md)
+* [nx_azure_iot_json](./docs/azure_rtos_iot_json.md)
+* [nx_azure_iot_adu_agent](./docs/azure_rtos_iot_adu_agent.md)
 * [nx_azure_iot_security_module](../azure_iot_security_module/docs/nx_azure_iot_security_module.md)
 
 ## Need Help?

diff --git a/addons/azure_iot/nx_azure_iot.c b/addons/azure_iot/nx_azure_iot.c
@@ -9,7 +9,6 @@
 /*                                                                        */
 /**************************************************************************/
 
-/* Version: 6.1 */
 #include <stdio.h>
 #include <stdarg.h>
 

diff --git a/addons/azure_iot/nx_azure_iot.h b/addons/azure_iot/nx_azure_iot.h
@@ -9,8 +9,6 @@
 /*                                                                        */
 /**************************************************************************/
 
-/* Version: 6.1 */
-
 /**
  * @file nx_azure_iot.h
  *

diff --git a/addons/azure_iot/nx_azure_iot_adu_agent.c b/addons/azure_iot/nx_azure_iot_adu_agent.c
@@ -9,10 +9,16 @@
 /*                                                                        */
 /**************************************************************************/
 
-/* Version: 6.1 */
-
 #include "nx_azure_iot_adu_agent.h"
 
+/* ADU Version e.g: AzureRTOS;agent/x.x.x */
+#define NX_AZURE_IOT_ADU_AGENT_STR(C)                                   #C
+#define NX_AZURE_IOT_ADU_AGENT_TO_STR(x)                                NX_AZURE_IOT_ADU_AGENT_STR(x)
+#define NX_AZURE_IOT_ADU_AGENT_VERSION                                  "AzureRTOS;agent/" \
+                                                                        NX_AZURE_IOT_ADU_AGENT_TO_STR(NETXDUO_MAJOR_VERSION) "." \
+                                                                        NX_AZURE_IOT_ADU_AGENT_TO_STR(NETXDUO_MINOR_VERSION) "." \
+                                                                        NX_AZURE_IOT_ADU_AGENT_TO_STR(NETXDUO_PATCH_VERSION)
+
 /* Update buffer pointer and buffer size.  */
 #define NX_AZURE_IOT_ADU_AGENT_PTR_UPDATE(a, b, c, d)                   { \
                                                                             (a) = (c); \
@@ -501,6 +507,9 @@ NX_AZURE_IOT_ADU_AGENT *adu_agent_ptr = (NX_AZURE_IOT_ADU_AGENT *)args;
             /* Reset the state.  */
             adu_agent_ptr -> nx_azure_iot_adu_agent_state = NX_AZURE_IOT_ADU_AGENT_STATE_IDLE;
 
+            /* Report idle state to server.  */
+            nx_azure_iot_adu_agent_reported_properties_state_send(adu_agent_ptr);
+
             LogInfo(LogLiteralArgs("Cancel Command received"));
             return(NX_AZURE_IOT_SUCCESS);
         }
@@ -3006,10 +3015,15 @@ UINT response_status;
                                                                     sizeof(NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_MODEL) - 1,
                                                                     device_properties -> model, device_properties -> model_length)) ||
         (nx_azure_iot_json_writer_append_property_with_string_value(&json_writer,
-                                                                    (const UCHAR *)NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_INTERFACE_ID,
-                                                                    sizeof(NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_INTERFACE_ID) - 1,
-                                                                    (const UCHAR *)NX_AZURE_IOT_ADU_AGENT_INTERFACE_ID,
-                                                                    sizeof(NX_AZURE_IOT_ADU_AGENT_INTERFACE_ID) - 1)) ||
+                                                                    (const UCHAR *)NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_CONTRACT_MODEL_ID,
+                                                                    sizeof(NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_CONTRACT_MODEL_ID) - 1,
+                                                                    (const UCHAR *)NX_AZURE_IOT_ADU_AGENT_CONTRACT_MODEL_ID,
+                                                                    sizeof(NX_AZURE_IOT_ADU_AGENT_CONTRACT_MODEL_ID) - 1)) ||
+        (nx_azure_iot_json_writer_append_property_with_string_value(&json_writer,
+                                                                    (const UCHAR *)NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_ADU_VERSION,
+                                                                    sizeof(NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_ADU_VERSION) - 1,
+                                                                    (const UCHAR *)NX_AZURE_IOT_ADU_AGENT_VERSION,
+                                                                    sizeof(NX_AZURE_IOT_ADU_AGENT_VERSION) - 1)) ||
         (nx_azure_iot_json_writer_append_end_object(&json_writer)))
     {
         nx_packet_release(packet_ptr);

diff --git a/addons/azure_iot/nx_azure_iot_adu_agent.h b/addons/azure_iot/nx_azure_iot_adu_agent.h
@@ -9,8 +9,6 @@
 /*                                                                        */
 /**************************************************************************/
 
-/* Version: 6.1 */
-
 /**
  * @file nx_azure_iot_adu_agent.h
  *
@@ -44,8 +42,8 @@ extern   "C" {
 /* Define the ADU agent component name.  */
 #define NX_AZURE_IOT_ADU_AGENT_COMPONENT_NAME                           "deviceUpdate"
 
-/* Define the ADU agent interface ID.  */
-#define NX_AZURE_IOT_ADU_AGENT_INTERFACE_ID                             "dtmi:azure:iot:deviceUpdate;1"
+/* Define the ADU agent contract model ID.  */
+#define NX_AZURE_IOT_ADU_AGENT_CONTRACT_MODEL_ID                        "dtmi:azure:iot:deviceUpdateContractModel;2"
 
 /* Define the compatibility value.  */
 #define NX_AZURE_IOT_ADU_AGENT_PROPERTY_VALUE_COMPATIBILITY             "manufacturer,model"
@@ -56,7 +54,7 @@ extern   "C" {
 #define NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_DEVICEPROPERTIES           "deviceProperties"
 #define NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_MANUFACTURER               "manufacturer"
 #define NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_MODEL                      "model"
-#define NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_INTERFACE_ID               "interfaceId"
+#define NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_CONTRACT_MODEL_ID          "contractModelId"
 #define NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_ADU_VERSION                "aduVer"
 #define NX_AZURE_IOT_ADU_AGENT_PROPERTY_NAME_DO_VERSION                 "doVer"