summaryrefslogtreecommitdiff
path: root/common/core/inc
diff options
context:
space:
mode:
Diffstat (limited to 'common/core/inc')
-rw-r--r--common/core/inc/ux_api.h17
-rw-r--r--common/core/inc/ux_user_sample.h50
2 files changed, 64 insertions, 3 deletions
diff --git a/common/core/inc/ux_api.h b/common/core/inc/ux_api.h
index cb83675..ec661a7 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.2.0 */
+/* 6.2.1 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -128,6 +128,11 @@
/* added interface instance */
/* creation strategy control, */
/* resulting in version 6.2.0 */
+/* 03-08-2023 Chaoqiong Xiao Modified comment(s), */
+/* accepted UX_MAX_CLASSES as */
+/* max class driver configure, */
+/* added a new error code, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
@@ -255,6 +260,13 @@ typedef signed char SCHAR;
#define UX_MAX_SLAVE_INTERFACES 16
#endif
+/* Define USBX max number of classes (1 ~ n). */
+#ifndef UX_MAX_CLASSES
+#define UX_MAX_CLASSES 2
+#endif
+#ifndef UX_MAX_CLASS_DRIVER
+#define UX_MAX_CLASS_DRIVER UX_MAX_CLASSES
+#endif
/* Define USBX max number of devices (1 ~ n). */
#ifndef UX_MAX_DEVICES
@@ -295,7 +307,7 @@ typedef signed char SCHAR;
#define AZURE_RTOS_USBX
#define USBX_MAJOR_VERSION 6
#define USBX_MINOR_VERSION 2
-#define USBX_PATCH_VERSION 0
+#define USBX_PATCH_VERSION 1
/* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens. */
@@ -1417,6 +1429,7 @@ VOID _ux_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, UL
#define UX_INVALID_PARAMETER 0xfa
#define UX_ABORTED 0xf9
#define UX_MATH_OVERFLOW 0xf8
+#define UX_INVALID_BUILD_OPTION 0xf7
#define UX_TOO_MANY_DEVICES 0x11
#define UX_MEMORY_INSUFFICIENT 0x12
diff --git a/common/core/inc/ux_user_sample.h b/common/core/inc/ux_user_sample.h
index 72a7e5e..f974505 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.2.0 */
+/* 6.2.1 */
/* */
/* AUTHOR */
/* */
@@ -89,6 +89,16 @@
/* added host stack instance */
/* creation strategy control, */
/* resulting in version 6.2.0 */
+/* 03-08-2023 Chaoqiong Xiao Modified comment(s), */
+/* added option to disable dev */
+/* alternate setting support, */
+/* added option to disable dev */
+/* framework initialize scan, */
+/* added option to reference */
+/* names by pointer to chars, */
+/* added option to enable */
+/* basic USBX error checking, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
@@ -409,6 +419,30 @@
/* #define UX_DEVICE_BIDIRECTIONAL_ENDPOINT_SUPPORT */
+/* Defined, this macro disables interface alternate setting support.
+ Device stalls
+ */
+/* UX_DEVICE_ALTERNATE_SETTING_SUPPORT_DISABLE */
+
+
+/* Defined, this macro disables device framework scan, where max number of endpoints (except EP0)
+ and max number of interfaces are calculated at runtime, as a base to allocate memory for
+ interfaces and endpoints structures and their buffers.
+ Undefined, the following two macros must be defined to initialize memory structures.
+ */
+/* #define UX_DEVICE_INITIALIZE_FRAMEWORK_SCAN_DISABLE */
+
+/* Works if UX_DEVICE_INITIALIZE_FRAMEWORK_SCAN_DISABLE is defined.
+ This value represents max number of endpoints (except EP0) activated at the same time.
+ */
+/* #define UX_MAX_DEVICE_ENDPOINTS 2 */
+
+/* Works if UX_DEVICE_INITIALIZE_FRAMEWORK_SCAN_DISABLE is defined.
+ This value represents max number of interfaces activated at the same time.
+ */
+/* #define UX_MAX_DEVICE_INTERFACES 1 */
+
+
/* Defined, this macro enables device/host PIMA MTP support. */
/* #define UX_PIMA_WITH_MTP_SUPPORT */
@@ -421,6 +455,7 @@
/* #define UX_HOST_DEVICE_CLASS_CODE_VALIDATION_ENABLE */
+
/* Defined, host HID interrupt OUT transfer is supported. */
/* #define UX_HOST_CLASS_HID_INTERRUPT_OUT_SUPPORT */
@@ -448,6 +483,12 @@
*/
/* #define UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_CONTROL UX_HOST_STACK_CONFIGURATION_INSTANCE_CREATE_OWNED */
+/* Defined, the _name in structs are referenced by pointer instead of by contents.
+ By default the _name is an array of string that saves characters, the contents are compared to confirm match.
+ If referenced by pointer the address pointer to const string is saved, the pointers are compared to confirm match.
+ */
+/* #define UX_NAME_REFERENCED_BY_POINTER */
+
/* Defined, this value will only enable the host side of usbx. */
/* #define UX_HOST_SIDE_ONLY */
@@ -522,6 +563,13 @@
/* #define UX_ASSERT_FAIL for (;;) {tx_thread_sleep(UX_WAIT_FOREVER); } */
+/* Defined, this option enables the basic USBX error checking. This define is typically used
+ when the application is debugging and removed after the application is fully debugged. */
+/*
+#define UX_ENABLE_ERROR_CHECKING
+*/
+
+
/* DEBUG includes and macros for a specific platform go here. */
#ifdef UX_INCLUDE_USER_DEFINE_BSP
#include "usb_bsp.h"