diff options
| author | Frédéric Desbiens <[email protected]> | 2025-02-24 10:34:16 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-02-24 10:34:16 -0500 |
| commit | cfdd55c48a2f44afa55cdb198fe65ddb0c8565ba (patch) | |
| tree | 4af04d5ea99731b7f130caaba80bda79ecf3f4e4 /common/core/src | |
| parent | 2d4a4aea0c17e365fed92443b22b28e2f81bb114 (diff) | |
| parent | 2512084d63366ea25da65d82c35f1fd0d65aa7cb (diff) | |
Merge pull request #190 from eclipse-threadx/version-642v6.4.2_rel
Version v6.4.2
Diffstat (limited to 'common/core/src')
| -rw-r--r-- | common/core/src/ux_device_stack_microsoft_extension_register.c | 42 | ||||
| -rw-r--r-- | common/core/src/ux_utility_timer_create.c | 75 | ||||
| -rw-r--r-- | common/core/src/ux_utility_timer_delete.c | 73 |
3 files changed, 100 insertions, 90 deletions
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; |
