Skip to content

Merge changes ahead of the v6.5.0.202601 release #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fdesbiens merged 29 commits into from
Mar 6, 2026
Merged

Merge changes ahead of the v6.5.0.202601 release #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
52ebed5
Added missing RX ports
Mar 11, 2025
6308d4b
Updated settings to HW capabilities
Jan 9, 2026
7fefa31
Merge remote-tracking branch 'github/master'
Jan 9, 2026
578d90a
check for NULL packet before using the pointer
lsoest Dec 22, 2025
ee07785
Refer to ux internal marco instead of using direct tx
ayedm1 Dec 3, 2025
ce4baf2
Refer to ux internal marco instead of using direct tx
ayedm1 Dec 3, 2025
02f431b
Merge branch 'refer_to_ux_internal_defines' of https://github.com/aye…
ayedm1 Jan 20, 2026
f1839db
Merge pull request #238 from spir6s/master
fdesbiens Feb 5, 2026
8cdbb7c
Device MSC: add START STOP (load/eject) request support
ayedm1 Jan 18, 2026
72ae213
DCD Simulator Controller Driver: Add uninitializes API
ayedm1 Jan 26, 2026
ac2a50e
remove duplicated defines
ayedm1 Feb 9, 2026
6ad1351
device cdc acm support break request
ayedm1 Jan 27, 2026
f1bccd9
Merge pull request #249 from ayedm1/remove-duplicated-defines
fdesbiens Feb 12, 2026
efd3de1
Merge pull request #243 from BerninaInternationalAG/add_nullptr_check
fdesbiens Feb 12, 2026
596f94b
create mutex before calling _ux_utility_memory_allocate
lsoest Feb 16, 2026
69c64cc
Merge pull request #252 from BerninaInternationalAG/create_mutex_befo…
fdesbiens Feb 23, 2026
117ac4f
Merge pull request #247 from ayedm1/uninit_dcd_sim
fdesbiens Feb 24, 2026
3634023
Fix RNDIS linux enumeration
ayedm1 Feb 14, 2026
69f3b6b
Merge pull request #251 from ayedm1/fix_rndis_linx_enumeration
fdesbiens Mar 2, 2026
74288e2
Merge pull request #246 from ayedm1/device_storage_load_eject_media
fdesbiens Mar 3, 2026
3456fbc
Merge pull request #228 from ayedm1/refer_to_ux_internal_defines
fdesbiens Mar 3, 2026
ea36a88
Updated copyright headers and removed trailing whitespace
fdesbiens Mar 5, 2026
c70c1ca
Updated version number constants
fdesbiens Mar 5, 2026
47f337f
Merge pull request #254 from fdesbiens/dev
fdesbiens Mar 5, 2026
46f65a3
Fixed issue where pointer size was used instead of buffer size in ux_…
fdesbiens Mar 5, 2026
b20e7ef
Removed misplaced copyright headers and updated port version strings
fdesbiens Mar 5, 2026
7e76808
Merge pull request #255 from fdesbiens/dev
fdesbiens Mar 5, 2026
7f5c6b2
Merge branch 'dev' into cdc_acm_device_break_req
ayedm1 Mar 5, 2026
35ba543
Merge pull request #248 from ayedm1/cdc_acm_device_break_req
fdesbiens Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions common/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ target_sources(${PROJECT_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_function.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_initialize.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_initialize_complete.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_uninitialize.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_state_change.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_transfer_abort.c
${CMAKE_CURRENT_LIST_DIR}/src/ux_dcd_sim_slave_transfer_request.c
Expand Down
119 changes: 5 additions & 114 deletions common/core/inc/ux_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
* Copyright (c) 2026-present Eclipse ThreadX contributors
*
* This program and the accompanying materials are made available under the
* terms of the MIT License which is available at
Expand Down Expand Up @@ -38,116 +39,6 @@
/* Please note that basic data type definitions and other architecture-*/
/* specific information is contained in the file ux_port.h. */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
/* added query usage of device */
/* ClassSubclassProtocol, */
/* added option to disable FX */
/* media integration, prefixed */
/* UX to MS_TO_TICK, added */
/* APIs and macros related to */
/* uninitialize, optimized */
/* based on compile */
/* definitions, updated */
/* product constants, used */
/* host class extension */
/* pointer for class specific */
/* structured data, used UX */
/* prefix to refer to TX */
/* symbols instead of using */
/* them directly, */
/* resulting in version 6.1 */
/* 11-09-2020 Chaoqiong Xiao Modified comment(s), */
/* used unsigned defines, */
/* added HCD uninit command, */
/* modified HCD status code, */
/* fixed compile warnings, */
/* resulting in version 6.1.2 */
/* 12-31-2020 Chaoqiong Xiao Modified comment(s), */
/* added BOS support, */
/* resulting in version 6.1.3 */
/* 02-02-2021 Chaoqiong Xiao Modified comment(s), */
/* added configuration activate*/
/* and deactivate support, */
/* added host printer get */
/* device ID support, */
/* added host device string */
/* descriptor get support, */
/* added events for device */
/* connection/disconnection, */
/* resulting in version 6.1.4 */
/* 03-02-2021 Chaoqiong Xiao Modified comment(s), */
/* resulting in version 6.1.5 */
/* 04-02-2021 Chaoqiong Xiao Modified comment(s), */
/* added macros for Word/DWord */
/* to bytes extraction, */
/* resulting in version 6.1.6 */
/* 06-02-2021 Chaoqiong Xiao Modified comment(s), */
/* added trace dependency test,*/
/* changed transfer timeout */
/* value, */
/* resulting in version 6.1.7 */
/* 08-02-2021 Chaoqiong Xiao Modified comment(s), */
/* fixed spelling error, */
/* fixed trace ID order error, */
/* resulting in version 6.1.8 */
/* 10-15-2021 Chaoqiong Xiao Modified comment(s), */
/* improved assert macros, */
/* added transfer size field, */
/* improved traceX support, */
/* resulting in version 6.1.9 */
/* 01-31-2022 Chaoqiong Xiao Modified comment(s), */
/* added too many ports error, */
/* moved tx_api.h include and */
/* typedefs to ux_port.h, */
/* added standalone support, */
/* added device HID trace IDs, */
/* added some general errors, */
/* added printer trace IDs, */
/* resulting in version 6.1.10 */
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* assumed OS types to avoid */
/* standalone compiling error, */
/* added CCID trace IDs, */
/* resulting in version 6.1.11 */
/* 07-29-2022 Chaoqiong Xiao Modified comment(s), */
/* fixed parameter/variable */
/* names conflict C++ keyword, */
/* added feedback size defs, */
/* added shared device config */
/* descriptor for enum scan, */
/* resulting in version 6.1.12 */
/* 10-31-2022 Chaoqiong Xiao Modified comment(s), */
/* added some ETH error codes, */
/* allowed align minimal def, */
/* added interface instance */
/* creation strategy control, */
/* resulting in version 6.2.0 */
/* 03-08-2023 Chaoqiong Xiao Modified comment(s), */
/* accepted UX_MAX_CLASSES as */
/* max class driver configure, */
/* added a new error code, */
/* resulting in version 6.2.1 */
/* 10-31-2023 Chaoqiong Xiao Modified comment(s), */
/* refined memory management, */
/* added a new mode to manage */
/* endpoint buffer in classes, */
/* optimized USB descriptors, */
/* added error checks support, */
/* resulting in version 6.3.0 */
/* 12-31-2023 Chaoqiong Xiao Modified comment(s), */
/* resulting in version 6.4.0 */
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.1 */
/* 02-19-2025 Frédéric Desbiens Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.2 */
/* */
/**************************************************************************/

#ifndef UX_API_H
Expand Down Expand Up @@ -347,10 +238,10 @@ typedef signed char SCHAR;
/* Define basic constants for the USBX Stack. */
#define AZURE_RTOS_USBX
#define USBX_MAJOR_VERSION 6
#define USBX_MINOR_VERSION 4
#define USBX_PATCH_VERSION 5
#define USBX_BUILD_VERSION 202504
#define USBX_HOTFIX_VERSION 'a'
#define USBX_MINOR_VERSION 5
#define USBX_PATCH_VERSION 0
#define USBX_BUILD_VERSION 202601
#define USBX_HOTFIX_VERSION ' '

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

Expand Down
15 changes: 5 additions & 10 deletions common/core/inc/ux_class_audio10.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
*
* Copyright (c) 2024 Microsoft Corporation
* Copyright (c) 2026-present Eclipse ThreadX contributors
*
* This program and the accompanying materials are made available under the
* terms of the MIT License which is available at
* https://opensource.org/licenses/MIT.
*
*
* SPDX-License-Identifier: MIT
**************************************************************************/

Expand Down Expand Up @@ -35,12 +36,6 @@
/* This file contains all the header and structures used by the */
/* USBX Audio Class (UAC) 1.0. */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 07-29-2022 Chaoqiong Xiao Initial Version 6.1.12 */
/* */
/**************************************************************************/

#ifndef UX_CLASS_AUDIO10_H
Expand Down Expand Up @@ -933,7 +928,7 @@ typedef struct UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_CONTINUOUS_DESCRIPTOR_STRUCT
UCHAR tLowerSamFreq[3];
UCHAR tUpperSamFreq[3];
}
UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_CONTINUOUS_DESCRIPTOR,
UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_CONTINUOUS_DESCRIPTOR,
UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_DESCRIPTOR_0;

typedef struct UX_CLASS_AUDIO10_TYPE_I_FORMAT_TYPE_DISCRETE_DESCRIPTOR_STRUCT
Expand Down
13 changes: 4 additions & 9 deletions common/core/inc/ux_class_audio20.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
*
* Copyright (c) 2024 Microsoft Corporation
* Copyright (c) 2026-present Eclipse ThreadX contributors
*
* This program and the accompanying materials are made available under the
* terms of the MIT License which is available at
* https://opensource.org/licenses/MIT.
*
*
* SPDX-License-Identifier: MIT
**************************************************************************/

Expand Down Expand Up @@ -35,12 +36,6 @@
/* This file contains all the header and structures used by the */
/* USBX Audio Class (UAC) 2.0. */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 07-29-2022 Chaoqiong Xiao Initial Version 6.1.12 */
/* */
/**************************************************************************/

#ifndef UX_CLASS_AUDIO20_H
Expand Down
Loading