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 | |
| parent | 2d4a4aea0c17e365fed92443b22b28e2f81bb114 (diff) | |
| parent | 2512084d63366ea25da65d82c35f1fd0d65aa7cb (diff) | |
Merge pull request #190 from eclipse-threadx/version-642v6.4.2_rel
Version v6.4.2
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | common/core/inc/ux_api.h | 20 | ||||
| -rw-r--r-- | common/core/inc/ux_utility.h | 16 | ||||
| -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 | ||||
| -rw-r--r-- | test/cmake/usbx/regression/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/cmake/usbx/samples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/regression/usbx_msrc_66679_test.c | 2 | ||||
| -rw-r--r-- | test/regression/usbx_msrc_72227_host_pima_read_test.c | 2 | ||||
| -rw-r--r-- | test/regression/usbx_msrc_72525_host_pima_obj_handles_get_test.c | 2 | ||||
| -rw-r--r-- | test/regression/usbx_msrc_72619_host_pima_stor_ids_get_test.c | 2 | ||||
| -rw-r--r-- | test/regression/usbx_msrc_81292_host_pima_deactivate_semaphore_test.c | 2 | ||||
| -rw-r--r-- | test/regression/usbx_msrc_81323_host_pima_deactivate_no_int_ep_test.c | 2 | ||||
| -rw-r--r-- | test/regression/usbx_msrc_84686_host_pima_storage_info_get_test.c | 2 | ||||
| -rw-r--r-- | test/regression/usbx_pima_basic_test.c | 2 |
17 files changed, 135 insertions, 114 deletions
@@ -12,3 +12,4 @@ install_manifest.txt compile_commands.json CTestTestfile.cmake +coverage_report/ diff --git a/CMakeLists.txt b/CMakeLists.txt index ddf8291..3f7a92b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 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; diff --git a/test/cmake/usbx/regression/CMakeLists.txt b/test/cmake/usbx/regression/CMakeLists.txt index 00e58cf..372f235 100644 --- a/test/cmake/usbx/regression/CMakeLists.txt +++ b/test/cmake/usbx/regression/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.13 FATAL_ERROR) cmake_policy(SET CMP0057 NEW) project(regression_test LANGUAGES C) diff --git a/test/cmake/usbx/samples/CMakeLists.txt b/test/cmake/usbx/samples/CMakeLists.txt index 16e1d52..667be34 100644 --- a/test/cmake/usbx/samples/CMakeLists.txt +++ b/test/cmake/usbx/samples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.13 FATAL_ERROR) cmake_policy(SET CMP0057 NEW) project(samples LANGUAGES C) diff --git a/test/regression/usbx_msrc_66679_test.c b/test/regression/usbx_msrc_66679_test.c index c31a6aa..4664b26 100644 --- a/test/regression/usbx_msrc_66679_test.c +++ b/test/regression/usbx_msrc_66679_test.c @@ -743,7 +743,7 @@ CHAR * memory_pointer; } /* MS extensions. */ - status = _ux_device_stack_microsoft_extension_register(UX_DEMO_VENDOR_REQUEST, test_ms_vendor_request); + status = ux_device_stack_microsoft_extension_register(UX_DEMO_VENDOR_REQUEST, test_ms_vendor_request); if(status!=UX_SUCCESS) { diff --git a/test/regression/usbx_msrc_72227_host_pima_read_test.c b/test/regression/usbx_msrc_72227_host_pima_read_test.c index e4e4616..8b783f5 100644 --- a/test/regression/usbx_msrc_72227_host_pima_read_test.c +++ b/test/regression/usbx_msrc_72227_host_pima_read_test.c @@ -874,7 +874,7 @@ ULONG test_n; } /* MTP requires MTP extensions. */ - status = _ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); + status = ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); if (status != UX_SUCCESS) { printf("ERROR #%d\n", __LINE__); diff --git a/test/regression/usbx_msrc_72525_host_pima_obj_handles_get_test.c b/test/regression/usbx_msrc_72525_host_pima_obj_handles_get_test.c index 36279dd..8625d24 100644 --- a/test/regression/usbx_msrc_72525_host_pima_obj_handles_get_test.c +++ b/test/regression/usbx_msrc_72525_host_pima_obj_handles_get_test.c @@ -874,7 +874,7 @@ ULONG test_n; } /* MTP requires MTP extensions. */ - status = _ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); + status = ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); if (status != UX_SUCCESS) { printf("ERROR #%d\n", __LINE__); diff --git a/test/regression/usbx_msrc_72619_host_pima_stor_ids_get_test.c b/test/regression/usbx_msrc_72619_host_pima_stor_ids_get_test.c index 21cb229..0e339ce 100644 --- a/test/regression/usbx_msrc_72619_host_pima_stor_ids_get_test.c +++ b/test/regression/usbx_msrc_72619_host_pima_stor_ids_get_test.c @@ -874,7 +874,7 @@ ULONG test_n; } /* MTP requires MTP extensions. */ - status = _ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); + status = ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); if (status != UX_SUCCESS) { printf("ERROR #%d\n", __LINE__); diff --git a/test/regression/usbx_msrc_81292_host_pima_deactivate_semaphore_test.c b/test/regression/usbx_msrc_81292_host_pima_deactivate_semaphore_test.c index cbe7242..e31607e 100644 --- a/test/regression/usbx_msrc_81292_host_pima_deactivate_semaphore_test.c +++ b/test/regression/usbx_msrc_81292_host_pima_deactivate_semaphore_test.c @@ -874,7 +874,7 @@ ULONG test_n; } /* MTP requires MTP extensions. */ - status = _ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); + status = ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); if (status != UX_SUCCESS) { printf("ERROR #%d\n", __LINE__); diff --git a/test/regression/usbx_msrc_81323_host_pima_deactivate_no_int_ep_test.c b/test/regression/usbx_msrc_81323_host_pima_deactivate_no_int_ep_test.c index 882f961..fbec683 100644 --- a/test/regression/usbx_msrc_81323_host_pima_deactivate_no_int_ep_test.c +++ b/test/regression/usbx_msrc_81323_host_pima_deactivate_no_int_ep_test.c @@ -868,7 +868,7 @@ ULONG test_n; } /* MTP requires MTP extensions. */ - status = _ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); + status = ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); if (status != UX_SUCCESS) { printf("ERROR #%d\n", __LINE__); diff --git a/test/regression/usbx_msrc_84686_host_pima_storage_info_get_test.c b/test/regression/usbx_msrc_84686_host_pima_storage_info_get_test.c index 1a2909d..2b90a9d 100644 --- a/test/regression/usbx_msrc_84686_host_pima_storage_info_get_test.c +++ b/test/regression/usbx_msrc_84686_host_pima_storage_info_get_test.c @@ -875,7 +875,7 @@ ULONG test_n; } /* MTP requires MTP extensions. */ - status = _ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); + status = ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); if (status != UX_SUCCESS) { printf("ERROR #%d\n", __LINE__); diff --git a/test/regression/usbx_pima_basic_test.c b/test/regression/usbx_pima_basic_test.c index 8932004..0ea9912 100644 --- a/test/regression/usbx_pima_basic_test.c +++ b/test/regression/usbx_pima_basic_test.c @@ -874,7 +874,7 @@ ULONG test_n; } /* MTP requires MTP extensions. */ - status = _ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); + status = ux_device_stack_microsoft_extension_register(UX_TEST_VENDOR_REQUEST, pima_device_vendor_request); if (status != UX_SUCCESS) { printf("ERROR #%d\n", __LINE__); |
