Skip to content

Version v6.4.2 #190

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
merged 10 commits into from
Feb 24, 2025
Merged

Version v6.4.2 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5e27107
add user api for _ux_device_stack_microsoft_extension_register
ayedm1 Jan 30, 2025
3295563
use UX prefix to refer to TX symbols
ayedm1 Feb 1, 2025
aafe6d4
add device state check define to avoid use of internal struct fileds …
ayedm1 Feb 4, 2025
4e578be
Merge pull request #186 from ayedm1/use-ux-prefix-to-refer-to-tx-symbols
fdesbiens Feb 14, 2025
93d7dcc
Merge pull request #185 from ayedm1/add-a-define-check-device-state
fdesbiens Feb 14, 2025
424ce27
Merge pull request #184 from ayedm1/add-user-api-for-ux_device_stack_…
fdesbiens Feb 20, 2025
f1c7045
Updated minimal CMake version to 3.13.
fdesbiens Feb 24, 2025
fcfe244
Merge pull request #189 from eclipse-threadx/cmake-version
fdesbiens Feb 24, 2025
2b0a32b
Tweak to .gitignore.
fdesbiens Feb 24, 2025
2512084
Incremented patch version in ux_api.h.
fdesbiens Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading