Skip to content

Commit 8b6e03a

Browse files
authored
Merge pull request #371 from eclipse-threadx/dev
Merge changes ahead of the v6.5.0.202601 release
2 parents b54bf01 + e60e431 commit 8b6e03a

1,785 files changed

Lines changed: 7484 additions & 35117 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

addons/BSD/nxd_bsd.c

Lines changed: 28 additions & 788 deletions
Large diffs are not rendered by default.

addons/BSD/nxd_bsd.h

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
2+
* Copyright (c) 2024 Microsoft Corporation
33
* Copyright (c) 2025-present Eclipse ThreadX Contributors
4-
*
4+
*
55
* This program and the accompanying materials are made available under the
66
* terms of the MIT License which is available at
77
* https://opensource.org/licenses/MIT.
8-
*
8+
*
99
* SPDX-License-Identifier: MIT
1010
**************************************************************************/
1111

@@ -36,29 +36,6 @@
3636
/* implement the BSD 4.3 Socket API Compatible Interface to NetX Duo. */
3737
/* */
3838
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
44-
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* 03-02-2021 Yuxin Zhou Modified comment(s), and */
47-
/* fixed compiler warnings, */
48-
/* resulting in version 6.1.5 */
49-
/* 10-15-2021 Yuxin Zhou Modified comment(s), and */
50-
/* defined IP protocols for */
51-
/* ICMP, IGMP and ICMPv6, */
52-
/* resulting in version 6.1.9 */
53-
/* 10-31-2023 Chaoqiong Xiao Modified comment(s), and */
54-
/* added option to enable */
55-
/* native APIs with prefix, */
56-
/* resulting in version 6.3.0 */
57-
/* 12-31-2023 Yanwu Cai Modified comment(s), and */
58-
/* added support of recvmsg, */
59-
/* added nx_link to raw socket,*/
60-
/* resulting in version 6.4.0 */
61-
/* */
6239
/**************************************************************************/
6340

6441
#ifndef NXD_BSD_H
@@ -708,6 +685,9 @@ typedef struct FD_SET_STRUCT /* The select socket array manager.
708685
typedef struct NX_BSD_SOCKET_SUSPEND_STRUCT
709686
{
710687
ULONG nx_bsd_socket_suspend_actual_flags;
688+
nx_bsd_fd_set nx_bsd_socket_suspend_read_request_fd_set;
689+
nx_bsd_fd_set nx_bsd_socket_suspend_write_request_fd_set;
690+
nx_bsd_fd_set nx_bsd_socket_suspend_exception_request_fd_set;
711691
nx_bsd_fd_set nx_bsd_socket_suspend_read_fd_set;
712692
nx_bsd_fd_set nx_bsd_socket_suspend_write_fd_set;
713693
nx_bsd_fd_set nx_bsd_socket_suspend_exception_fd_set;

addons/auto_ip/nx_auto_ip.c

Lines changed: 9 additions & 124 deletions
Large diffs are not rendered by default.

addons/auto_ip/nx_auto_ip.h

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
2+
* Copyright (c) 2024 Microsoft Corporation
33
* Copyright (c) 2025-present Eclipse ThreadX Contributors
4-
*
4+
*
55
* This program and the accompanying materials are made available under the
66
* terms of the MIT License which is available at
77
* https://opensource.org/licenses/MIT.
8-
*
8+
*
99
* SPDX-License-Identifier: MIT
1010
**************************************************************************/
1111

@@ -37,17 +37,6 @@
3737
/* including all data types and external references. It is assumed */
3838
/* that nx_api.h and nx_port.h have already been included. */
3939
/* */
40-
/* RELEASE HISTORY */
41-
/* */
42-
/* DATE NAME DESCRIPTION */
43-
/* */
44-
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
45-
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
46-
/* resulting in version 6.1 */
47-
/* 10-15-2021 Yuxin Zhou Modified comment(s), included */
48-
/* necessary header file, */
49-
/* resulting in version 6.1.9 */
50-
/* */
5140
/**************************************************************************/
5241

5342
#ifndef NX_AUTO_IP_H
@@ -127,7 +116,7 @@ extern "C" {
127116
#define NX_AUTO_IP_BAD_INTERFACE_INDEX 0xA02
128117

129118

130-
/* Define the AutoIP structure that holds all the information necessary for this AutoIP
119+
/* Define the AutoIP structure that holds all the information necessary for this AutoIP
131120
instance. */
132121

133122
typedef struct NX_AUTO_IP_STRUCT
@@ -151,9 +140,9 @@ typedef struct NX_AUTO_IP_STRUCT
151140

152141
/* Application caller is present, perform API mapping. */
153142

154-
/* Determine if error checking is desired. If so, map AutoIP API functions
143+
/* Determine if error checking is desired. If so, map AutoIP API functions
155144
to the appropriate error checking front-ends. Otherwise, map API
156-
functions to the core functions that actually perform the work.
145+
functions to the core functions that actually perform the work.
157146
Note: error checking is enabled by default. */
158147

159148
#ifdef NX_DISABLE_ERROR_CHECKING

addons/azure_iot/nx_azure_iot.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
2+
* Copyright (c) 2024 Microsoft Corporation
33
* Copyright (c) 2025-present Eclipse ThreadX Contributors
4-
*
4+
*
55
* This program and the accompanying materials are made available under the
66
* terms of the MIT License which is available at
77
* https://opensource.org/licenses/MIT.
8-
*
8+
*
99
* SPDX-License-Identifier: MIT
1010
**************************************************************************/
1111

addons/azure_iot/nx_azure_iot.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
2+
* Copyright (c) 2024 Microsoft Corporation
33
* Copyright (c) 2025-present Eclipse ThreadX Contributors
4-
*
4+
*
55
* This program and the accompanying materials are made available under the
66
* terms of the MIT License which is available at
77
* https://opensource.org/licenses/MIT.
8-
*
8+
*
99
* SPDX-License-Identifier: MIT
1010
**************************************************************************/
1111

@@ -69,7 +69,7 @@ extern "C" {
6969
* message, at-most one format specifier can be specifed at the end of message.
7070
* Currently only two format specifier are supported:
7171
* - %d for integer
72-
* - %s for string, where first argument is length and second is pointer to string
72+
* - %s for string, where first argument is length and second is pointer to string
7373
*/
7474
UINT nx_azure_iot_log(UCHAR *type_ptr, UINT type_len, UCHAR *msg_ptr, UINT msg_len, ...);
7575

@@ -231,7 +231,7 @@ typedef struct NX_AZURE_IOT_THREAD_STRUCT
231231
* manage activities related to Azure IoT services. Only one NX_AZURE_IOT instance
232232
* is needed to manage instances for Azure IoT hub, IoT Central, and Device Provisioning
233233
* Services (DPS).
234-
*
234+
*
235235
* @param[in] nx_azure_iot_ptr A pointer to a #NX_AZURE_IOT
236236
* @param[in] name_ptr A pointer to a NULL-terminated string indicating the name of the Azure IoT instance.
237237
* @param[in] ip_ptr A pointer to a `NX_IP`, which is the IP stack used to connect to Azure IoT Services.

addons/azure_iot/nx_azure_iot_adu_agent.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
2+
* Copyright (c) 2024 Microsoft Corporation
33
* Copyright (c) 2025-present Eclipse ThreadX Contributors
4-
*
4+
*
55
* This program and the accompanying materials are made available under the
66
* terms of the MIT License which is available at
77
* https://opensource.org/licenses/MIT.
8-
*
8+
*
99
* SPDX-License-Identifier: MIT
1010
**************************************************************************/
1111

@@ -1199,7 +1199,7 @@ UCHAR *sha256_decoded_hash_64_ptr;
11991199
UCHAR *sha256_decoded_hash_ptr;
12001200

12011201
/* The updateManifestSignature is used to ensure that the information contained within the updateManifest
1202-
hasn't been tampered with.
1202+
hasn't been tampered with.
12031203
https://docs.microsoft.com/en-us/azure/iot-hub-device-update/device-update-security#json-web-signature-jws */
12041204

12051205
/* JWS value format: BASE64URL(UTF8(header)) + "." + BASE64URL(UTF8(payload) + "." + BASE64URL(signature)). */
@@ -1322,7 +1322,7 @@ UCHAR *sha256_decoded_hash_ptr;
13221322
"alg": "RS256",
13231323
"kid": "ADU.200702.R"
13241324
}
1325-
1325+
13261326
Payload:
13271327
{
13281328
"kty": "RSA",
@@ -2368,7 +2368,7 @@ NX_AZURE_IOT_ADU_AGENT_WORKFLOW *workflow = &(adu_agent_ptr -> nx_azure_iot_adu_
23682368
}
23692369
}
23702370

2371-
/* File URLs.
2371+
/* File URLs.
23722372
Note: 1. file urls property can exist or not.
23732373
2. file urls property value can be object. */
23742374
else if (nx_azure_iot_json_reader_token_is_text_equal(json_reader_ptr,
@@ -3619,7 +3619,7 @@ UINT update_id_length;
36193619

36203620
/**
36213621
* @brief Send service reported properties.
3622-
*
3622+
*
36233623
* @param updateState state to report.
36243624
* @param result Result to report (optional, can be NULL).
36253625
*/

addons/azure_iot/nx_azure_iot_adu_agent.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
2+
* Copyright (c) 2024 Microsoft Corporation
33
* Copyright (c) 2025-present Eclipse ThreadX Contributors
4-
*
4+
*
55
* This program and the accompanying materials are made available under the
66
* terms of the MIT License which is available at
77
* https://opensource.org/licenses/MIT.
8-
*
8+
*
99
* SPDX-License-Identifier: MIT
1010
**************************************************************************/
1111

@@ -119,13 +119,13 @@ extern "C" {
119119
#define NX_AZURE_IOT_ADU_AGENT_HTTP_CONNECT_DONE_EVENT ((ULONG)0x00000010)
120120
#define NX_AZURE_IOT_ADU_AGENT_HTTP_RECEIVE_EVENT ((ULONG)0x00000020)
121121

122-
/* Define the agent state values. Interaction between agent and server.
122+
/* Define the agent state values. Interaction between agent and server.
123123
https://docs.microsoft.com/en-us/azure/iot-hub-device-update/device-update-plug-and-play#state */
124124
#define NX_AZURE_IOT_ADU_AGENT_STATE_IDLE 0
125125
#define NX_AZURE_IOT_ADU_AGENT_STATE_DEPLOYMENT_IN_PROGRESS 6
126126
#define NX_AZURE_IOT_ADU_AGENT_STATE_FAILED 255
127127

128-
/* Define the agent action values. Interaction between agent and server.
128+
/* Define the agent action values. Interaction between agent and server.
129129
https://docs.microsoft.com/en-us/azure/iot-hub-device-update/device-update-plug-and-play#action */
130130
#define NX_AZURE_IOT_ADU_AGENT_ACTION_APPLY_DEPLOYMENT 3
131131
#define NX_AZURE_IOT_ADU_AGENT_ACTION_CANCEL 255

addons/azure_iot/nx_azure_iot_adu_root_key.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
2+
* Copyright (c) 2024 Microsoft Corporation
33
* Copyright (c) 2025-present Eclipse ThreadX Contributors
4-
*
4+
*
55
* This program and the accompanying materials are made available under the
66
* terms of the MIT License which is available at
77
* https://opensource.org/licenses/MIT.
8-
*
8+
*
99
* SPDX-License-Identifier: MIT
1010
**************************************************************************/
1111

1212
#include "nx_azure_iot_adu_agent.h"
1313

1414
/* Update manifest is meant for ADU devices to know what files are needed to be downloaded and installed.
15-
The update manifest is signed by ADU so devices can trust that the content wasnot altered during the
15+
The update manifest is signed by ADU so devices can trust that the content wasnot altered during the
1616
transmission.
1717
18-
ADU will leverage two types of keys - Root Key(s) and Signing Key(s). Signing keys will be used to
18+
ADU will leverage two types of keys - Root Key(s) and Signing Key(s). Signing keys will be used to
1919
digest sign the update manifest and root keys will be used to sign the signing keys.
20-
20+
2121
*Root key - used to sign signing public key; root public key is hardcoded in ADU devices.
2222
*Signing key - used to sign update manifest; signing public key signed with the master key is included in digest signature header.
2323
*/

addons/azure_iot/nx_azure_iot_hub_client.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
2+
* Copyright (c) 2024 Microsoft Corporation
33
* Copyright (c) 2025-present Eclipse ThreadX Contributors
4-
*
4+
*
55
* This program and the accompanying materials are made available under the
66
* terms of the MIT License which is available at
77
* https://opensource.org/licenses/MIT.
8-
*
8+
*
99
* SPDX-License-Identifier: MIT
1010
**************************************************************************/
1111

0 commit comments

Comments
 (0)