Skip to content

Commit 3574b6b

Browse files
yuxin-azrtosyuxin-azrtos
committed
Release 6.1.8
1 parent 7568997 commit 3574b6b

File tree

56 files changed

+950
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+950
-126
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
22

33
# Set up the project
44
project(usbx
5-
VERSION 6.0.0
65
LANGUAGES C ASM
76
)
87

@@ -28,7 +27,11 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
2827
set(CUSTOM_INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/custom_inc)
2928

3029
# Pick up the port specific stuff first
31-
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN})
30+
if(DEFINED USBX_CUSTOM_PORT)
31+
add_subdirectory(${USBX_CUSTOM_PORT} usbx_port)
32+
else()
33+
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN})
34+
endif()
3235

3336
# Then the common files
3437
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/common)

‎common/core/inc/ux_api.h‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* APPLICATION INTERFACE DEFINITION RELEASE */
2727
/* */
2828
/* ux_api.h PORTABLE C */
29-
/* 6.1.7 */
29+
/* 6.1.8 */
3030
/* AUTHOR */
3131
/* */
3232
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -92,6 +92,10 @@
9292
/* changed transfer timeout */
9393
/* value, */
9494
/* resulting in version 6.1.7 */
95+
/* 08-02-2021 Chaoqiong Xiao Modified comment(s), */
96+
/* fixed spelling error, */
97+
/* fixed trace ID order error, */
98+
/* resulting in version 6.1.8 */
9599
/* */
96100
/**************************************************************************/
97101

@@ -226,7 +230,7 @@ typedef signed char SCHAR;
226230
#define AZURE_RTOS_USBX
227231
#define USBX_MAJOR_VERSION 6
228232
#define USBX_MINOR_VERSION 1
229-
#define USBX_PATCH_VERSION 7
233+
#define USBX_PATCH_VERSION 8
230234

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

@@ -237,7 +241,7 @@ typedef signed char SCHAR;
237241
#define UX_COMPILE_TIME_ASSERT(exp, meaningful_name_as_variable) \
238242
typedef char UX_CONCAT2(meaningful_name_as_variable, __LINE__)[!(exp) ? -1 : 1];
239243

240-
/* Arithmetics. */
244+
/* Arithmetic. */
241245

242246
#define UX_MIN(a, b) ((a) < (b) ? (a) : (b))
243247
#define UX_MAX(a, b) ((a) > (b) ? (a) : (b))
@@ -321,7 +325,7 @@ typedef signed char SCHAR;
321325

322326
VOID _ux_utility_debug_log(UCHAR *debug_location, UCHAR *debug_message, ULONG debug_code, ULONG debug_parameter_1, ULONG debug_parameter_2);
323327

324-
/* DEBUG LOG MESSAGES SHOULD BE WRITEN LIKE THIS IN THE CODE : */
328+
/* DEBUG LOG MESSAGES SHOULD BE WRITTEN LIKE THIS IN THE CODE : */
325329
/* If error log is enabled, insert this error message into the log buffer. */
326330
/* UX_DEBUG_LOG("_ux_host_stack_rh_device_insertion", "Device insertion", port_index, port_index, 0) */
327331

@@ -594,23 +598,23 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
594598
#define UX_TRACE_DEVICE_STACK_CLASS_REGISTER (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 3) /* I1 = class name , I2 = interface number, I3 = parameter */
595599
#define UX_TRACE_DEVICE_STACK_CLEAR_FEATURE (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 4) /* I1 = request type , I2 = request value , I3 = request index */
596600
#define UX_TRACE_DEVICE_STACK_CONFIGURATION_GET (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 5) /* I1 = configuration value */
597-
#define UX_TRACE_DEVICE_STACK_CONFIGURATION_SET (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 5) /* I1 = configuration value */
598-
#define UX_TRACE_DEVICE_STACK_CONNECT (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 6) /* */
599-
#define UX_TRACE_DEVICE_STACK_DESCRIPTOR_SEND (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 7) /* I1 = descriptor type , I2 = request index */
600-
#define UX_TRACE_DEVICE_STACK_DISCONNECT (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 8) /* I1 = device */
601-
#define UX_TRACE_DEVICE_STACK_ENDPOINT_STALL (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 9) /* I1 = endpoint */
602-
#define UX_TRACE_DEVICE_STACK_GET_STATUS (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 10) /* I1 = request type , I2 = request value , I3 = request index */
603-
#define UX_TRACE_DEVICE_STACK_HOST_WAKEUP (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 11) /* */
604-
#define UX_TRACE_DEVICE_STACK_INITIALIZE (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 12) /* */
605-
#define UX_TRACE_DEVICE_STACK_INTERFACE_DELETE (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 13) /* I1 = interface */
606-
#define UX_TRACE_DEVICE_STACK_INTERFACE_GET (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 14) /* I1 = interface value */
607-
#define UX_TRACE_DEVICE_STACK_INTERFACE_SET (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 15) /* I1 = alternate setting value */
608-
#define UX_TRACE_DEVICE_STACK_SET_FEATURE (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 16) /* I1 = request value , I2 = request index */
609-
#define UX_TRACE_DEVICE_STACK_TRANSFER_ABORT (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 17) /* I1 = transfer request, I2 = completion code */
610-
#define UX_TRACE_DEVICE_STACK_TRANSFER_ALL_REQUEST_ABORT (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 18) /* I1 = endpoint , I2 = completion code */
611-
#define UX_TRACE_DEVICE_STACK_TRANSFER_REQUEST (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 19) /* I1 = transfer request */
612-
#define UX_TRACE_DEVICE_STACK_MICROSOFT_EXTENSION_REGISTER (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 20) /* I1 = transfer request */
613-
#define UX_TRACE_DEVICE_STACK_CLASS_UNREGISTER (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 21) /* I1 = class name */
601+
#define UX_TRACE_DEVICE_STACK_CONFIGURATION_SET (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 6) /* I1 = configuration value */
602+
#define UX_TRACE_DEVICE_STACK_CONNECT (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 7) /* */
603+
#define UX_TRACE_DEVICE_STACK_DESCRIPTOR_SEND (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 8) /* I1 = descriptor type , I2 = request index */
604+
#define UX_TRACE_DEVICE_STACK_DISCONNECT (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 9) /* I1 = device */
605+
#define UX_TRACE_DEVICE_STACK_ENDPOINT_STALL (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 10) /* I1 = endpoint */
606+
#define UX_TRACE_DEVICE_STACK_GET_STATUS (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 11) /* I1 = request type , I2 = request value , I3 = request index */
607+
#define UX_TRACE_DEVICE_STACK_HOST_WAKEUP (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 12) /* */
608+
#define UX_TRACE_DEVICE_STACK_INITIALIZE (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 13) /* */
609+
#define UX_TRACE_DEVICE_STACK_INTERFACE_DELETE (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 14) /* I1 = interface */
610+
#define UX_TRACE_DEVICE_STACK_INTERFACE_GET (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 15) /* I1 = interface value */
611+
#define UX_TRACE_DEVICE_STACK_INTERFACE_SET (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 16) /* I1 = alternate setting value */
612+
#define UX_TRACE_DEVICE_STACK_SET_FEATURE (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 17) /* I1 = request value , I2 = request index */
613+
#define UX_TRACE_DEVICE_STACK_TRANSFER_ABORT (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 18) /* I1 = transfer request, I2 = completion code */
614+
#define UX_TRACE_DEVICE_STACK_TRANSFER_ALL_REQUEST_ABORT (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 19) /* I1 = endpoint , I2 = completion code */
615+
#define UX_TRACE_DEVICE_STACK_TRANSFER_REQUEST (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 20) /* I1 = transfer request */
616+
#define UX_TRACE_DEVICE_STACK_MICROSOFT_EXTENSION_REGISTER (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 21) /* I1 = transfer request */
617+
#define UX_TRACE_DEVICE_STACK_CLASS_UNREGISTER (UX_TRACE_DEVICE_STACK_EVENTS_BASE + 22) /* I1 = class name */
614618

615619
/* Define the USBX device stack events first. */
616620

@@ -619,7 +623,7 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
619623
#define UX_TRACE_DEVICE_CLASS_DPUMP_DEACTIVATE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 2) /* I1 = class instance */
620624
#define UX_TRACE_DEVICE_CLASS_DPUMP_READ (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 3) /* I1 = class instance , I2 = buffer , I3 = requested_length */
621625
#define UX_TRACE_DEVICE_CLASS_DPUMP_WRITE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 4) /* I1 = class instance , I2 = buffer , I3 = requested_length */
622-
#define UX_TRACE_DEVICE_CLASS_DPUMP_CHANGE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 4) /* I1 = class instance , I2 = buffer , I3 = requested_length */
626+
#define UX_TRACE_DEVICE_CLASS_DPUMP_CHANGE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 5) /* I1 = class instance , I2 = buffer , I3 = requested_length */
623627

624628
#define UX_TRACE_DEVICE_CLASS_CDC_ACM_ACTIVATE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 10) /* I1 = class instance */
625629
#define UX_TRACE_DEVICE_CLASS_CDC_ACM_DEACTIVATE (UX_TRACE_DEVICE_CLASS_EVENTS_BASE + 11) /* I1 = class instance */

‎common/core/inc/ux_dcd_sim_slave.h‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* COMPONENT DEFINITION RELEASE */
2727
/* */
2828
/* ux_dcd_sim_slave.h PORTABLE C */
29-
/* 6.1.6 */
29+
/* 6.1.8 */
3030
/* AUTHOR */
3131
/* */
3232
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -48,12 +48,26 @@
4848
/* added HCD connected to, */
4949
/* supported bi-dir-endpoints, */
5050
/* resulting in version 6.1.6 */
51+
/* 08-02-2021 Chaoqiong Xiao Modified comment(s), */
52+
/* added extern "C" keyword */
53+
/* for compatibility with C++, */
54+
/* resulting in version 6.1.8 */
5155
/* */
5256
/**************************************************************************/
5357

5458
#ifndef UX_DCD_SIM_SLAVE_H
5559
#define UX_DCD_SIM_SLAVE_H
5660

61+
/* Determine if a C++ compiler is being used. If so, ensure that standard
62+
C is used to process the API information. */
63+
64+
#ifdef __cplusplus
65+
66+
/* Yes, C++ compiler is present. Use standard C. */
67+
extern "C" {
68+
69+
#endif
70+
5771

5872
/* Define USB slave simulator major equivalences. */
5973

@@ -144,5 +158,11 @@ UINT _ux_dcd_sim_slave_transfer_abort(UX_DCD_SIM_SLAVE *dcd_sim_slave, UX_SLA
144158
/* Define Device Simulator Class API prototypes. */
145159

146160
#define ux_dcd_sim_slave_initialize _ux_dcd_sim_slave_initialize
161+
/* Determine if a C++ compiler is being used. If so, complete the standard
162+
C conditional started above. */
163+
#ifdef __cplusplus
164+
}
165+
#endif
166+
147167
#endif
148168

‎common/core/inc/ux_device_class_dpump.h‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* COMPONENT DEFINITION RELEASE */
2727
/* */
2828
/* ux_device_class_dpump.h PORTABLE C */
29-
/* 6.1 */
29+
/* 6.1.8 */
3030
/* AUTHOR */
3131
/* */
3232
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -43,12 +43,26 @@
4343
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
4444
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
4545
/* resulting in version 6.1 */
46+
/* 08-02-2021 Wen Wang Modified comment(s), */
47+
/* added extern "C" keyword */
48+
/* for compatibility with C++, */
49+
/* resulting in version 6.1.8 */
4650
/* */
4751
/**************************************************************************/
4852

4953
#ifndef UX_DEVICE_CLASS_DPUMP_H
5054
#define UX_DEVICE_CLASS_DPUMP_H
5155

56+
/* Determine if a C++ compiler is being used. If so, ensure that standard
57+
C is used to process the API information. */
58+
59+
#ifdef __cplusplus
60+
61+
/* Yes, C++ compiler is present. Use standard C. */
62+
extern "C" {
63+
64+
#endif
65+
5266

5367
/* Define Storage Class USB Class constants. */
5468

@@ -100,4 +114,10 @@ UINT _ux_device_class_dpump_change(UX_SLAVE_CLASS_COMMAND *command);
100114
#define ux_device_class_dpump_read _ux_device_class_dpump_read
101115
#define ux_device_class_dpump_write _ux_device_class_dpump_write
102116

117+
/* Determine if a C++ compiler is being used. If so, complete the standard
118+
C conditional started above. */
119+
#ifdef __cplusplus
120+
}
121+
#endif
122+
103123
#endif

0 commit comments

Comments
 (0)