Skip to content

Commit

Permalink
Merge pull request #190 from eclipse-threadx/version-642
Browse files Browse the repository at this point in the history 
Version v6.4.2
  • Loading branch information
@fdesbiens
fdesbiens authored Feb 24, 2025
2 parents 2d4a4ae + 2512084 commit cfdd55c
Show file tree
Hide file tree
Showing 17 changed files with 135 additions and 114 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ install_manifest.txt
compile_commands.json
CTestTestfile.cmake

coverage_report/
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)

# Set up the project
project(usbx
Expand Down
20 changes: 15 additions & 5 deletions common/core/inc/ux_api.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
*
* Copyright (c) 2024 Microsoft Corporation
*
* 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 @@ -141,9 +141,12 @@
/* 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), */
/* 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 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -345,7 +348,7 @@ typedef signed char SCHAR;
#define AZURE_RTOS_USBX
#define USBX_MAJOR_VERSION 6
#define USBX_MINOR_VERSION 4
#define USBX_PATCH_VERSION 1
#define USBX_PATCH_VERSION 2

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

Expand Down Expand Up @@ -2685,6 +2688,10 @@ typedef struct UX_SYSTEM_SLAVE_STRUCT
#define UX_SYSTEM_DEVICE_MAX_CLASS_GET() (1)
#endif

#define UX_SLAVE_DEVICE_CHECK_STATE(state) \
(_ux_system_slave->ux_system_slave_device.ux_slave_device_state & (state)) ? UX_TRUE : UX_FALSE \


typedef struct UX_SYSTEM_OTG_STRUCT
{

Expand Down Expand Up @@ -2838,6 +2845,7 @@ typedef struct UX_HOST_CLASS_DPUMP_STRUCT
#define ux_device_stack_interface_start _ux_device_stack_interface_start
#define ux_device_stack_transfer_request _ux_device_stack_transfer_request
#define ux_device_stack_transfer_abort _ux_device_stack_transfer_abort
#define ux_device_stack_microsoft_extension_register _ux_device_stack_microsoft_extension_register

#define ux_device_stack_tasks_run _ux_device_stack_tasks_run
#define ux_device_stack_transfer_run _ux_device_stack_transfer_run
Expand Down Expand Up @@ -2938,6 +2946,8 @@ UINT ux_device_stack_interface_set(UCHAR * device_framework, ULONG device_fra
UINT ux_device_stack_interface_start(UX_SLAVE_INTERFACE *ux_interface);
UINT ux_device_stack_transfer_request(UX_SLAVE_TRANSFER *transfer_request, ULONG slave_length, ULONG host_length);
UINT ux_device_stack_transfer_request_abort(UX_SLAVE_TRANSFER *transfer_request, ULONG completion_code);
UINT ux_device_stack_microsoft_extension_register(ULONG vendor_request,
UINT (*vendor_request_function)(ULONG, ULONG, ULONG, ULONG, UCHAR *, ULONG *));

UINT ux_device_stack_tasks_run(VOID);
UINT ux_device_stack_transfer_run(UX_SLAVE_TRANSFER *transfer_request, ULONG slave_length, ULONG host_length);
Expand Down
16 changes: 8 additions & 8 deletions common/core/inc/ux_utility.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
*
* Copyright (c) 2024 Microsoft Corporation
*
* 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 All @@ -20,11 +20,11 @@
/**************************************************************************/


/**************************************************************************/
/* */
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_utility.h PORTABLE C */
/**************************************************************************/
/* */
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_utility.h PORTABLE C */
/* 6.3.0 */
/* AUTHOR */
/* */
Expand Down
42 changes: 21 additions & 21 deletions common/core/src/ux_device_stack_microsoft_extension_register.c
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
*
* Copyright (c) 2024 Microsoft Corporation
*
* 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
**************************************************************************/


/**************************************************************************/
/**************************************************************************/
/** */
/** USBX Component */
/** */
/** USBX Component */
/** */
/** Device Stack */
/** */
Expand Down Expand Up @@ -45,31 +45,31 @@
/* */
/* INPUT */
/* */
/* vendor_command Vendor Command. */
/* application_callback Application Callback */
/* vendor_command Vendor Command. */
/* application_callback Application Callback */
/* */
/* OUTPUT */
/* */
/* Completion Status */
/* Completion Status */
/* */
/* CALLS */
/* */
/* CALLS */
/* */
/* None */
/* */
/* CALLED BY */
/* */
/* Application */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* */
/* CALLED BY */
/* */
/* Application */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
/* resulting in version 6.1 */
/* */
/**************************************************************************/
UINT _ux_device_stack_microsoft_extension_register(ULONG vendor_request,
UINT _ux_device_stack_microsoft_extension_register(ULONG vendor_request,
UINT (*vendor_request_function)(ULONG, ULONG, ULONG, ULONG, UCHAR *, ULONG *))
{

Expand All @@ -79,7 +79,7 @@ UINT _ux_device_stack_microsoft_extension_register(ULONG vendor_request,

/* Store the vendor command. */
_ux_system_slave -> ux_system_slave_device_vendor_request = vendor_request;
_ux_system_slave -> ux_system_slave_device_vendor_request_function = vendor_request_function;
_ux_system_slave -> ux_system_slave_device_vendor_request_function = vendor_request_function;

/* Return successful completion. */
return(UX_SUCCESS);
Expand Down
75 changes: 40 additions & 35 deletions common/core/src/ux_utility_timer_create.c
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/***************************************************************************
* Copyright (c) 2024 Microsoft Corporation
*
* Copyright (c) 2024 Microsoft Corporation
*
* 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
**************************************************************************/


/**************************************************************************/
/**************************************************************************/
/** */
/** USBX Component */
/** */
/** USBX Component */
/** */
/** Utility */
/** */
Expand All @@ -28,51 +28,56 @@


#if !defined(UX_STANDALONE)
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _ux_utility_timer_create PORTABLE C */
/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _ux_utility_timer_create PORTABLE C */
/* 6.1.11 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
/* */
/* DESCRIPTION */
/* */
/* This function creates a timer. */
/* */
/* INPUT */
/* */
/* timer Pointer to timer */
/* timer_name Name of timer */
/* */
/* OUTPUT */
/* */
/* Completion Status */
/* */
/* CALLS */
/* */
/* */
/* This function creates a timer. */
/* */
/* INPUT */
/* */
/* timer Pointer to timer */
/* timer_name Name of timer */
/* */
/* OUTPUT */
/* */
/* Completion Status */
/* */
/* CALLS */
/* */
/* tx_timer_create ThreadX timer create */
/* */
/* CALLED BY */
/* */
/* USBX Components */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* */
/* CALLED BY */
/* */
/* USBX Components */
/* */
/* RELEASE HISTORY */
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
/* resulting in version 6.1 */
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* off in standalone build, */
/* resulting in version 6.1.11 */
/* xx-xx-xxxx Chaoqiong Xiao Modified comment(s), */
/* used UX prefix to refer to */
/* TX symbols instead of using */
/* them directly, */
/* resulting in version 6.x */
/* */
/**************************************************************************/
UINT _ux_utility_timer_create(TX_TIMER *timer, CHAR *timer_name, VOID (*expiration_function) (ULONG),
ULONG expiration_input, ULONG initial_ticks, ULONG reschedule_ticks,
UINT _ux_utility_timer_create(UX_TIMER *timer, CHAR *timer_name, VOID (*expiration_function) (ULONG),
ULONG expiration_input, ULONG initial_ticks, ULONG reschedule_ticks,
UINT activation_flag)
{

Expand Down
Loading

0 comments on commit cfdd55c

Please sign in to comment.