diff options
Diffstat (limited to 'common/core/inc')
| -rw-r--r--[-rwxr-xr-x] | common/core/inc/ux_api.h | 26 | ||||
| -rw-r--r-- | common/core/inc/ux_user_sample.h | 25 |
2 files changed, 45 insertions, 6 deletions
diff --git a/common/core/inc/ux_api.h b/common/core/inc/ux_api.h index b8f0c6e..cb83675 100755..100644 --- a/common/core/inc/ux_api.h +++ b/common/core/inc/ux_api.h @@ -26,7 +26,7 @@ /* APPLICATION INTERFACE DEFINITION RELEASE */ /* */ /* ux_api.h PORTABLE C */ -/* 6.1.12 */ +/* 6.2.0 */ /* AUTHOR */ /* */ /* Chaoqiong Xiao, Microsoft Corporation */ @@ -122,6 +122,12 @@ /* added shared device config */ /* descriptor for enum scan, */ /* resulting in version 6.1.12 */ +/* 10-31-2022 Chaoqiong Xiao Modified comment(s), */ +/* added some ETH error codes, */ +/* allowed align minimal def, */ +/* added interface instance */ +/* creation strategy control, */ +/* resulting in version 6.2.0 */ /* */ /**************************************************************************/ @@ -288,8 +294,8 @@ typedef signed char SCHAR; /* Define basic constants for the USBX Stack. */ #define AZURE_RTOS_USBX #define USBX_MAJOR_VERSION 6 -#define USBX_MINOR_VERSION 1 -#define USBX_PATCH_VERSION 12 +#define USBX_MINOR_VERSION 2 +#define USBX_PATCH_VERSION 0 /* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens. */ @@ -1102,7 +1108,6 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL #define UX_NO_ALIGN 0u #define UX_ALIGN_16 0x0fu -#define UX_ALIGN_MIN 0x0fu #define UX_ALIGN_32 0x1fu #define UX_ALIGN_64 0x3fu #define UX_ALIGN_128 0x7fu @@ -1113,6 +1118,9 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL #define UX_ALIGN_4096 0xfffu #define UX_SAFE_ALIGN 0xffffffffu #define UX_MAX_SCATTER_GATHER_ALIGNMENT 4096 +#ifndef UX_ALIGN_MIN +#define UX_ALIGN_MIN UX_ALIGN_16 +#endif #define UX_MAX_USB_DEVICES 127 @@ -1483,6 +1491,10 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL #define UX_HOST_CLASS_AUDIO_WRONG_FREQUENCY 0x82 #define UX_CLASS_CDC_ECM_LINK_STATE_DOWN_ERROR 0x90 +#define UX_CLASS_ETH_LINK_STATE_DOWN_ERROR 0x90 +#define UX_CLASS_ETH_PACKET_POOL_ERROR 0x91 +#define UX_CLASS_ETH_PACKET_ERROR 0x92 +#define UX_CLASS_ETH_SIZE_ERROR 0x93 /* Define USBX HCD API function constants. */ @@ -2049,6 +2061,12 @@ typedef struct UX_CONFIGURATION_STRUCT ULONG ux_configuration_iad_protocol; } UX_CONFIGURATION; +#define UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_ALL 0 /* Default: all things created. */ +#define UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_OWNED 1 /* Owned: class owned things created. */ +#ifndef UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_CONTROL +#define UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_CONTROL UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_ALL +#endif + /* Define USBX Interface Descriptor structure. */ diff --git a/common/core/inc/ux_user_sample.h b/common/core/inc/ux_user_sample.h index 0df602e..72a7e5e 100644 --- a/common/core/inc/ux_user_sample.h +++ b/common/core/inc/ux_user_sample.h @@ -26,7 +26,7 @@ /* PORT SPECIFIC C INFORMATION RELEASE */ /* */ /* ux_user.h PORTABLE C */ -/* 6.1.12 */ +/* 6.2.0 */ /* */ /* AUTHOR */ /* */ @@ -83,6 +83,12 @@ /* added device CDC_ACM and */ /* printer write auto ZLP, */ /* resulting in version 6.1.12 */ +/* 10-31-2022 Chaoqiong Xiao Modified comment(s), */ +/* deprecated ECM pool option, */ +/* added align minimal config, */ +/* added host stack instance */ +/* creation strategy control, */ +/* resulting in version 6.2.0 */ /* */ /**************************************************************************/ @@ -116,6 +122,10 @@ /* Override various options with default values already assigned in ux_api.h or ux_port.h. Please also refer to ux_port.h for descriptions on each of these options. */ +/* Defined, this value represents minimal allocated memory alignment in number of bytes. + The default is UX_ALIGN_16 (0x0f) to align allocated memory to 16 bytes. */ +/* #define UX_ALIGN_MIN UX_ALIGN_16 */ + /* Defined, this value represents how many ticks per seconds for a specific hardware platform. The default is 1000 indicating 1 tick per millisecond. */ @@ -317,7 +327,9 @@ /* #define UX_HOST_CLASS_CDC_ECM_PACKET_POOL_INSTANCE_WAIT 10 */ -/* Defined, this enables CDC ECM class to use the packet pool from NetX instance. */ +/* Defined, this enables CDC ECM class to use the packet pool from NetX instance. + It's deprecated, packet pool from NetX instance is always used now. + */ /* #define UX_HOST_CLASS_CDC_ECM_USE_PACKET_POOL_FROM_NETX */ @@ -427,6 +439,15 @@ /* Defined, host audio optional interrupt endpoint is support. */ /* #define UX_HOST_CLASS_AUDIO_INTERRUPT_SUPPORT */ +/* Defined, this value controls host configuration instance creation, include all + interfaces and endpoints physical resources. + Possible settings: + UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_ALL (0) - The default, create all inside configuration. + UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_OWNED (1) - Create things owned by class driver. + Not defined, default setting is applied. + */ +/* #define UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_CONTROL UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_OWNED */ + /* Defined, this value will only enable the host side of usbx. */ /* #define UX_HOST_SIDE_ONLY */ |