summaryrefslogtreecommitdiff
path: root/common/core
diff options
context:
space:
mode:
authorFrédéric Desbiens <[email protected]>2025-02-24 10:34:16 -0500
committerGitHub <[email protected]>2025-02-24 10:34:16 -0500
commitcfdd55c48a2f44afa55cdb198fe65ddb0c8565ba (patch)
tree4af04d5ea99731b7f130caaba80bda79ecf3f4e4 /common/core
parent2d4a4aea0c17e365fed92443b22b28e2f81bb114 (diff)
parent2512084d63366ea25da65d82c35f1fd0d65aa7cb (diff)
Merge pull request #190 from eclipse-threadx/version-642v6.4.2_rel
Version v6.4.2
Diffstat (limited to 'common/core')
-rw-r--r--common/core/inc/ux_api.h20
-rw-r--r--common/core/inc/ux_utility.h16
-rw-r--r--common/core/src/ux_device_stack_microsoft_extension_register.c42
-rw-r--r--common/core/src/ux_utility_timer_create.c75
-rw-r--r--common/core/src/ux_utility_timer_delete.c73
5 files changed, 123 insertions, 103 deletions
diff --git a/common/core/inc/ux_api.h b/common/core/inc/ux_api.h
index 6689eb0..5f5feba 100644
--- a/common/core/inc/ux_api.h
+++ b/common/core/inc/ux_api.h
@@ -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
**************************************************************************/
@@ -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 */
/* */
/**************************************************************************/
@@ -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. */
@@ -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
{
@@ -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
@@ -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);
diff --git a/common/core/inc/ux_utility.h b/common/core/inc/ux_utility.h
index 035e066..8a8ea98 100644
--- a/common/core/inc/ux_utility.h
+++ b/common/core/inc/ux_utility.h
@@ -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
**************************************************************************/
@@ -20,11 +20,11 @@
/**************************************************************************/
-/**************************************************************************/
-/* */
-/* COMPONENT DEFINITION RELEASE */
-/* */
-/* ux_utility.h PORTABLE C */
+/**************************************************************************/
+/* */
+/* COMPONENT DEFINITION RELEASE */
+/* */
+/* ux_utility.h PORTABLE C */
/* 6.3.0 */
/* AUTHOR */
/* */
diff --git a/common/core/src/ux_device_stack_microsoft_extension_register.c b/common/core/src/ux_device_stack_microsoft_extension_register.c
index c078e19..4a3ad24 100644
--- a/common/core/src/ux_device_stack_microsoft_extension_register.c
+++ b/common/core/src/ux_device_stack_microsoft_extension_register.c
@@ -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 */
/** */
@@ -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 *))
{
@@ -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);
diff --git a/common/core/src/ux_utility_timer_create.c b/common/core/src/ux_utility_timer_create.c
index bc91c91..40bb661 100644
--- a/common/core/src/ux_utility_timer_create.c
+++ b/common/core/src/ux_utility_timer_create.c
@@ -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 */
/** */
@@ -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)
{
diff --git a/common/core/src/ux_utility_timer_delete.c b/common/core/src/ux_utility_timer_delete.c
index 233b8c0..8878708 100644
--- a/common/core/src/ux_utility_timer_delete.c
+++ b/common/core/src/ux_utility_timer_delete.c
@@ -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 */
/** */
@@ -28,47 +28,52 @@
#if !defined(UX_STANDALONE)
-/**************************************************************************/
-/* */
-/* FUNCTION RELEASE */
-/* */
-/* _ux_utility_timer_delete PORTABLE C */
-/* 6.1.11 */
+/**************************************************************************/
+/* */
+/* FUNCTION RELEASE */
+/* */
+/* _ux_utility_timer_delete PORTABLE C */
+/* 6.x */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
/* */
/* DESCRIPTION */
-/* */
-/* This function deletes a timer. */
-/* */
-/* INPUT */
-/* */
-/* timer Pointer to timer */
-/* */
-/* OUTPUT */
-/* */
-/* Completion Status */
-/* */
-/* CALLS */
-/* */
+/* */
+/* This function deletes a timer. */
+/* */
+/* INPUT */
+/* */
+/* timer Pointer to timer */
+/* */
+/* OUTPUT */
+/* */
+/* Completion Status */
+/* */
+/* CALLS */
+/* */
/* tx_timer_delete ThreadX timer delete */
-/* */
-/* CALLED BY */
-/* */
-/* USBX Components */
-/* */
-/* RELEASE HISTORY */
-/* */
-/* DATE NAME DESCRIPTION */
-/* */
+/* */
+/* CALLED BY */
+/* */
+/* USBX Components */
+/* */
+/* RELEASE HISTORY */
+/* */
+/* DATE NAME DESCRIPTION */
+/* */
/* 09-30-2020 Chaoqiong Xiao Initial 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_delete(TX_TIMER *timer)
+UINT _ux_utility_timer_delete(UX_TIMER *timer)
{
UINT status;
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-28 23:05:23 +0000