Skip to content

Commit 6dc0cf2

Browse files
fdesbiensfdesbiens
authored
Merge pull request #256 from eclipse-threadx/dev
Merge changes ahead of the v6.5.0.202601 release
2 parents 515c9a4 + 35ba543 commit 6dc0cf2

File tree

1,136 files changed

+30889
-42367
lines changed

Some content is hidden

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

1,136 files changed

+30889
-42367
lines changed

‎common/core/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ target_sources(${PROJECT_NAME} PRIVATE
1010
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_function.c
1111
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_initialize.c
1212
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_initialize_complete.c
13+
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_uninitialize.c
1314
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_state_change.c
1415
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_transfer_abort.c
1516
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_transfer_request.c

‎common/core/inc/ux_api.h‎

Lines changed: 5 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/***************************************************************************
22
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
34
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
@@ -38,116 +39,6 @@
3839
/* Please note that basic data type definitions and other architecture-*/
3940
/* specific information is contained in the file ux_port.h. */
4041
/* */
41-
/* RELEASE HISTORY */
42-
/* */
43-
/* DATE NAME DESCRIPTION */
44-
/* */
45-
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
46-
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
47-
/* added query usage of device */
48-
/* ClassSubclassProtocol, */
49-
/* added option to disable FX */
50-
/* media integration, prefixed */
51-
/* UX to MS_TO_TICK, added */
52-
/* APIs and macros related to */
53-
/* uninitialize, optimized */
54-
/* based on compile */
55-
/* definitions, updated */
56-
/* product constants, used */
57-
/* host class extension */
58-
/* pointer for class specific */
59-
/* structured data, used UX */
60-
/* prefix to refer to TX */
61-
/* symbols instead of using */
62-
/* them directly, */
63-
/* resulting in version 6.1 */
64-
/* 11-09-2020 Chaoqiong Xiao Modified comment(s), */
65-
/* used unsigned defines, */
66-
/* added HCD uninit command, */
67-
/* modified HCD status code, */
68-
/* fixed compile warnings, */
69-
/* resulting in version 6.1.2 */
70-
/* 12-31-2020 Chaoqiong Xiao Modified comment(s), */
71-
/* added BOS support, */
72-
/* resulting in version 6.1.3 */
73-
/* 02-02-2021 Chaoqiong Xiao Modified comment(s), */
74-
/* added configuration activate*/
75-
/* and deactivate support, */
76-
/* added host printer get */
77-
/* device ID support, */
78-
/* added host device string */
79-
/* descriptor get support, */
80-
/* added events for device */
81-
/* connection/disconnection, */
82-
/* resulting in version 6.1.4 */
83-
/* 03-02-2021 Chaoqiong Xiao Modified comment(s), */
84-
/* resulting in version 6.1.5 */
85-
/* 04-02-2021 Chaoqiong Xiao Modified comment(s), */
86-
/* added macros for Word/DWord */
87-
/* to bytes extraction, */
88-
/* resulting in version 6.1.6 */
89-
/* 06-02-2021 Chaoqiong Xiao Modified comment(s), */
90-
/* added trace dependency test,*/
91-
/* changed transfer timeout */
92-
/* value, */
93-
/* resulting in version 6.1.7 */
94-
/* 08-02-2021 Chaoqiong Xiao Modified comment(s), */
95-
/* fixed spelling error, */
96-
/* fixed trace ID order error, */
97-
/* resulting in version 6.1.8 */
98-
/* 10-15-2021 Chaoqiong Xiao Modified comment(s), */
99-
/* improved assert macros, */
100-
/* added transfer size field, */
101-
/* improved traceX support, */
102-
/* resulting in version 6.1.9 */
103-
/* 01-31-2022 Chaoqiong Xiao Modified comment(s), */
104-
/* added too many ports error, */
105-
/* moved tx_api.h include and */
106-
/* typedefs to ux_port.h, */
107-
/* added standalone support, */
108-
/* added device HID trace IDs, */
109-
/* added some general errors, */
110-
/* added printer trace IDs, */
111-
/* resulting in version 6.1.10 */
112-
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
113-
/* assumed OS types to avoid */
114-
/* standalone compiling error, */
115-
/* added CCID trace IDs, */
116-
/* resulting in version 6.1.11 */
117-
/* 07-29-2022 Chaoqiong Xiao Modified comment(s), */
118-
/* fixed parameter/variable */
119-
/* names conflict C++ keyword, */
120-
/* added feedback size defs, */
121-
/* added shared device config */
122-
/* descriptor for enum scan, */
123-
/* resulting in version 6.1.12 */
124-
/* 10-31-2022 Chaoqiong Xiao Modified comment(s), */
125-
/* added some ETH error codes, */
126-
/* allowed align minimal def, */
127-
/* added interface instance */
128-
/* creation strategy control, */
129-
/* resulting in version 6.2.0 */
130-
/* 03-08-2023 Chaoqiong Xiao Modified comment(s), */
131-
/* accepted UX_MAX_CLASSES as */
132-
/* max class driver configure, */
133-
/* added a new error code, */
134-
/* resulting in version 6.2.1 */
135-
/* 10-31-2023 Chaoqiong Xiao Modified comment(s), */
136-
/* refined memory management, */
137-
/* added a new mode to manage */
138-
/* endpoint buffer in classes, */
139-
/* optimized USB descriptors, */
140-
/* added error checks support, */
141-
/* resulting in version 6.3.0 */
142-
/* 12-31-2023 Chaoqiong Xiao Modified comment(s), */
143-
/* resulting in version 6.4.0 */
144-
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
145-
/* update version number, */
146-
/* resulting in version 6.4.1 */
147-
/* 02-19-2025 Frédéric Desbiens Modified comment(s), */
148-
/* update version number, */
149-
/* resulting in version 6.4.2 */
150-
/* */
15142
/**************************************************************************/
15243

15344
#ifndef UX_API_H
@@ -347,10 +238,10 @@ typedef signed char SCHAR;
347238
/* Define basic constants for the USBX Stack. */
348239
#define AZURE_RTOS_USBX
349240
#define USBX_MAJOR_VERSION 6
350-
#define USBX_MINOR_VERSION 4
351-
#define USBX_PATCH_VERSION 5
352-
#define USBX_BUILD_VERSION 202504
353-
#define USBX_HOTFIX_VERSION 'a'
241+
#define USBX_MINOR_VERSION 5
242+
#define USBX_PATCH_VERSION 0
243+
#define USBX_BUILD_VERSION 202601
244+
#define USBX_HOTFIX_VERSION ' '
354245

355246
/* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens. */
356247

‎common/core/inc/ux_class_audio10.h‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -35,12 +36,6 @@
3536
/* This file contains all the header and structures used by the */
3637
/* USBX Audio Class (UAC) 1.0. */
3738
/* */
38-
/* RELEASE HISTORY */
39-
/* */
40-
/* DATE NAME DESCRIPTION */
41-
/* */
42-
/* 07-29-2022 Chaoqiong Xiao Initial Version 6.1.12 */
43-
/* */
4439
/**************************************************************************/
4540

4641
#ifndef UX_CLASS_AUDIO10_H
@@ -933,7 +928,7 @@ typedef struct UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_CONTINUOUS_DESCRIPTOR_STRUCT
933928
UCHAR tLowerSamFreq[3];
934929
UCHAR tUpperSamFreq[3];
935930
}
936-
UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_CONTINUOUS_DESCRIPTOR,
931+
UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_CONTINUOUS_DESCRIPTOR,
937932
UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_DESCRIPTOR_0;
938933

939934
typedef struct UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_DISCRETE_DESCRIPTOR_STRUCT

‎common/core/inc/ux_class_audio20.h‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -35,12 +36,6 @@
3536
/* This file contains all the header and structures used by the */
3637
/* USBX Audio Class (UAC) 2.0. */
3738
/* */
38-
/* RELEASE HISTORY */
39-
/* */
40-
/* DATE NAME DESCRIPTION */
41-
/* */
42-
/* 07-29-2022 Chaoqiong Xiao Initial Version 6.1.12 */
43-
/* */
4439
/**************************************************************************/
4540

4641
#ifndef UX_CLASS_AUDIO20_H

0 commit comments

Comments
 (0)