Skip to content

Commit cfdd55c

Browse files
fdesbiensfdesbiens
authored
Merge pull request #190 from eclipse-threadx/version-642
Version v6.4.2
2 parents 2d4a4ae + 2512084 commit cfdd55c

17 files changed

+135
-114
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ install_manifest.txt
1212
compile_commands.json
1313
CTestTestfile.cmake
1414

15+
coverage_report/

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
22

33
# Set up the project
44
project(usbx

‎common/core/inc/ux_api.h

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
*
44
* This program and the accompanying materials are made available under the
55
* terms of the MIT License which is available at
66
* https://opensource.org/licenses/MIT.
7-
*
7+
*
88
* SPDX-License-Identifier: MIT
99
**************************************************************************/
1010

@@ -141,9 +141,12 @@
141141
/* resulting in version 6.3.0 */
142142
/* 12-31-2023 Chaoqiong Xiao Modified comment(s), */
143143
/* resulting in version 6.4.0 */
144-
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
144+
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
145145
/* update version number, */
146146
/* 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 */
147150
/* */
148151
/**************************************************************************/
149152

@@ -345,7 +348,7 @@ typedef signed char SCHAR;
345348
#define AZURE_RTOS_USBX
346349
#define USBX_MAJOR_VERSION 6
347350
#define USBX_MINOR_VERSION 4
348-
#define USBX_PATCH_VERSION 1
351+
#define USBX_PATCH_VERSION 2
349352

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

@@ -2685,6 +2688,10 @@ typedef struct UX_SYSTEM_SLAVE_STRUCT
26852688
#define UX_SYSTEM_DEVICE_MAX_CLASS_GET() (1)
26862689
#endif
26872690

2691+
#define UX_SLAVE_DEVICE_CHECK_STATE(state) \
2692+
(_ux_system_slave->ux_system_slave_device.ux_slave_device_state & (state)) ? UX_TRUE : UX_FALSE \
2693+
2694+
26882695
typedef struct UX_SYSTEM_OTG_STRUCT
26892696
{
26902697

@@ -2838,6 +2845,7 @@ typedef struct UX_HOST_CLASS_DPUMP_STRUCT
28382845
#define ux_device_stack_interface_start _ux_device_stack_interface_start
28392846
#define ux_device_stack_transfer_request _ux_device_stack_transfer_request
28402847
#define ux_device_stack_transfer_abort _ux_device_stack_transfer_abort
2848+
#define ux_device_stack_microsoft_extension_register _ux_device_stack_microsoft_extension_register
28412849

28422850
#define ux_device_stack_tasks_run _ux_device_stack_tasks_run
28432851
#define ux_device_stack_transfer_run _ux_device_stack_transfer_run
@@ -2938,6 +2946,8 @@ UINT ux_device_stack_interface_set(UCHAR * device_framework, ULONG device_fra
29382946
UINT ux_device_stack_interface_start(UX_SLAVE_INTERFACE *ux_interface);
29392947
UINT ux_device_stack_transfer_request(UX_SLAVE_TRANSFER *transfer_request, ULONG slave_length, ULONG host_length);
29402948
UINT ux_device_stack_transfer_request_abort(UX_SLAVE_TRANSFER *transfer_request, ULONG completion_code);
2949+
UINT ux_device_stack_microsoft_extension_register(ULONG vendor_request,
2950+
UINT (*vendor_request_function)(ULONG, ULONG, ULONG, ULONG, UCHAR *, ULONG *));
29412951

29422952
UINT ux_device_stack_tasks_run(VOID);
29432953
UINT ux_device_stack_transfer_run(UX_SLAVE_TRANSFER *transfer_request, ULONG slave_length, ULONG host_length);

‎common/core/inc/ux_utility.h

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

@@ -20,11 +20,11 @@
2020
/**************************************************************************/
2121

2222

23-
/**************************************************************************/
24-
/* */
25-
/* COMPONENT DEFINITION RELEASE */
26-
/* */
27-
/* ux_utility.h PORTABLE C */
23+
/**************************************************************************/
24+
/* */
25+
/* COMPONENT DEFINITION RELEASE */
26+
/* */
27+
/* ux_utility.h PORTABLE C */
2828
/* 6.3.0 */
2929
/* AUTHOR */
3030
/* */

‎common/core/src/ux_device_stack_microsoft_extension_register.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
*
44
* This program and the accompanying materials are made available under the
55
* terms of the MIT License which is available at
66
* https://opensource.org/licenses/MIT.
7-
*
7+
*
88
* SPDX-License-Identifier: MIT
99
**************************************************************************/
1010

1111

1212
/**************************************************************************/
1313
/**************************************************************************/
14-
/** */
15-
/** USBX Component */
14+
/** */
15+
/** USBX Component */
1616
/** */
1717
/** Device Stack */
1818
/** */
@@ -45,31 +45,31 @@
4545
/* */
4646
/* INPUT */
4747
/* */
48-
/* vendor_command Vendor Command. */
49-
/* application_callback Application Callback */
48+
/* vendor_command Vendor Command. */
49+
/* application_callback Application Callback */
5050
/* */
5151
/* OUTPUT */
5252
/* */
53-
/* Completion Status */
53+
/* Completion Status */
54+
/* */
55+
/* CALLS */
5456
/* */
55-
/* CALLS */
56-
/* */
5757
/* None */
58-
/* */
59-
/* CALLED BY */
60-
/* */
61-
/* Application */
62-
/* */
63-
/* RELEASE HISTORY */
64-
/* */
65-
/* DATE NAME DESCRIPTION */
66-
/* */
58+
/* */
59+
/* CALLED BY */
60+
/* */
61+
/* Application */
62+
/* */
63+
/* RELEASE HISTORY */
64+
/* */
65+
/* DATE NAME DESCRIPTION */
66+
/* */
6767
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
6868
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
6969
/* resulting in version 6.1 */
7070
/* */
7171
/**************************************************************************/
72-
UINT _ux_device_stack_microsoft_extension_register(ULONG vendor_request,
72+
UINT _ux_device_stack_microsoft_extension_register(ULONG vendor_request,
7373
UINT (*vendor_request_function)(ULONG, ULONG, ULONG, ULONG, UCHAR *, ULONG *))
7474
{
7575

@@ -79,7 +79,7 @@ UINT _ux_device_stack_microsoft_extension_register(ULONG vendor_request,
7979

8080
/* Store the vendor command. */
8181
_ux_system_slave -> ux_system_slave_device_vendor_request = vendor_request;
82-
_ux_system_slave -> ux_system_slave_device_vendor_request_function = vendor_request_function;
82+
_ux_system_slave -> ux_system_slave_device_vendor_request_function = vendor_request_function;
8383

8484
/* Return successful completion. */
8585
return(UX_SUCCESS);

‎common/core/src/ux_utility_timer_create.c

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
*
44
* This program and the accompanying materials are made available under the
55
* terms of the MIT License which is available at
66
* https://opensource.org/licenses/MIT.
7-
*
7+
*
88
* SPDX-License-Identifier: MIT
99
**************************************************************************/
1010

1111

1212
/**************************************************************************/
1313
/**************************************************************************/
14-
/** */
15-
/** USBX Component */
14+
/** */
15+
/** USBX Component */
1616
/** */
1717
/** Utility */
1818
/** */
@@ -28,51 +28,56 @@
2828

2929

3030
#if !defined(UX_STANDALONE)
31-
/**************************************************************************/
32-
/* */
33-
/* FUNCTION RELEASE */
34-
/* */
35-
/* _ux_utility_timer_create PORTABLE C */
31+
/**************************************************************************/
32+
/* */
33+
/* FUNCTION RELEASE */
34+
/* */
35+
/* _ux_utility_timer_create PORTABLE C */
3636
/* 6.1.11 */
3737
/* AUTHOR */
3838
/* */
3939
/* Chaoqiong Xiao, Microsoft Corporation */
4040
/* */
4141
/* DESCRIPTION */
42-
/* */
43-
/* This function creates a timer. */
44-
/* */
45-
/* INPUT */
46-
/* */
47-
/* timer Pointer to timer */
48-
/* timer_name Name of timer */
49-
/* */
50-
/* OUTPUT */
51-
/* */
52-
/* Completion Status */
53-
/* */
54-
/* CALLS */
55-
/* */
42+
/* */
43+
/* This function creates a timer. */
44+
/* */
45+
/* INPUT */
46+
/* */
47+
/* timer Pointer to timer */
48+
/* timer_name Name of timer */
49+
/* */
50+
/* OUTPUT */
51+
/* */
52+
/* Completion Status */
53+
/* */
54+
/* CALLS */
55+
/* */
5656
/* tx_timer_create ThreadX timer create */
57-
/* */
58-
/* CALLED BY */
59-
/* */
60-
/* USBX Components */
61-
/* */
62-
/* RELEASE HISTORY */
63-
/* */
64-
/* DATE NAME DESCRIPTION */
65-
/* */
57+
/* */
58+
/* CALLED BY */
59+
/* */
60+
/* USBX Components */
61+
/* */
62+
/* RELEASE HISTORY */
63+
/* */
64+
/* DATE NAME DESCRIPTION */
65+
/* */
6666
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
6767
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
6868
/* resulting in version 6.1 */
6969
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
7070
/* off in standalone build, */
7171
/* resulting in version 6.1.11 */
72+
/* xx-xx-xxxx Chaoqiong Xiao Modified comment(s), */
73+
/* used UX prefix to refer to */
74+
/* TX symbols instead of using */
75+
/* them directly, */
76+
/* resulting in version 6.x */
7277
/* */
7378
/**************************************************************************/
74-
UINT _ux_utility_timer_create(TX_TIMER *timer, CHAR *timer_name, VOID (*expiration_function) (ULONG),
75-
ULONG expiration_input, ULONG initial_ticks, ULONG reschedule_ticks,
79+
UINT _ux_utility_timer_create(UX_TIMER *timer, CHAR *timer_name, VOID (*expiration_function) (ULONG),
80+
ULONG expiration_input, ULONG initial_ticks, ULONG reschedule_ticks,
7681
UINT activation_flag)
7782
{
7883

0 commit comments

Comments
 (0)