summaryrefslogtreecommitdiff
path: root/common/core/inc
diff options
context:
space:
mode:
Diffstat (limited to 'common/core/inc')
-rwxr-xr-xcommon/core/inc/ux_api.h16
-rw-r--r--common/core/inc/ux_dcd_sim_slave.h11
-rw-r--r--common/core/inc/ux_hcd_sim_host.h6
-rw-r--r--common/core/inc/ux_user_sample.h50
4 files changed, 78 insertions, 5 deletions
diff --git a/common/core/inc/ux_api.h b/common/core/inc/ux_api.h
index 11969cc..1aafec1 100755
--- 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.5 */
+/* 6.1.6 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -83,6 +83,10 @@
/* resulting in version 6.1.4 */
/* 03-02-2021 Chaoqiong Xiao Modified comment(s), */
/* resulting in version 6.1.5 */
+/* 04-02-2021 Chaoqiong Xiao Modified comment(s), */
+/* added macros for Word/DWord */
+/* to bytes extraction, */
+/* resulting in version 6.1.6 */
/* */
/**************************************************************************/
@@ -217,7 +221,7 @@ typedef signed char SCHAR;
#define AZURE_RTOS_USBX
#define USBX_MAJOR_VERSION 6
#define USBX_MINOR_VERSION 1
-#define USBX_PATCH_VERSION 5
+#define USBX_PATCH_VERSION 6
/* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens. */
@@ -233,6 +237,14 @@ typedef signed char SCHAR;
#define UX_MIN(a, b) ((a) < (b) ? (a) : (b))
#define UX_MAX(a, b) ((a) > (b) ? (a) : (b))
+#define UX_W0(word) ( (word) & 0xFF)
+#define UX_W1(word) (((word) >> 8) & 0xFF)
+
+#define UX_DW0(dword) ( (dword) & 0xFF)
+#define UX_DW1(dword) (((dword) >> 8) & 0xFF)
+#define UX_DW2(dword) (((dword) >> 16) & 0xFF)
+#define UX_DW3(dword) (((dword) >> 24) & 0xFF)
+
/* Safe arithmetic check macros. */
#ifndef UX_DISABLE_ARITHMETIC_CHECK
diff --git a/common/core/inc/ux_dcd_sim_slave.h b/common/core/inc/ux_dcd_sim_slave.h
index f9ebcff..ae7e452 100644
--- a/common/core/inc/ux_dcd_sim_slave.h
+++ b/common/core/inc/ux_dcd_sim_slave.h
@@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_dcd_sim_slave.h PORTABLE C */
-/* 6.1 */
+/* 6.1.6 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -44,6 +44,10 @@
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
/* resulting in version 6.1 */
+/* 04-02-2021 Chaoqiong Xiao Modified comment(s), */
+/* added HCD connected to, */
+/* supported bi-dir-endpoints, */
+/* resulting in version 6.1.6 */
/* */
/**************************************************************************/
@@ -112,7 +116,12 @@ typedef struct UX_DCD_SIM_SLAVE_STRUCT
*ux_dcd_sim_slave_dcd_owner;
struct UX_DCD_SIM_SLAVE_ED_STRUCT
ux_dcd_sim_slave_ed[UX_DCD_SIM_SLAVE_MAX_ED];
+#ifdef UX_DEVICE_BIDIRECTIONAL_ENDPOINT_SUPPORT
+ struct UX_DCD_SIM_SLAVE_ED_STRUCT
+ ux_dcd_sim_slave_ed_in[UX_DCD_SIM_SLAVE_MAX_ED];
+#endif
UINT (*ux_dcd_sim_slave_dcd_control_request_process_hub)(UX_SLAVE_TRANSFER *transfer_request);
+ VOID *ux_dcd_sim_slave_hcd;
} UX_DCD_SIM_SLAVE;
diff --git a/common/core/inc/ux_hcd_sim_host.h b/common/core/inc/ux_hcd_sim_host.h
index 8bf78b9..825552c 100644
--- a/common/core/inc/ux_hcd_sim_host.h
+++ b/common/core/inc/ux_hcd_sim_host.h
@@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_hcd_sim_host.h PORTABLE C */
-/* 6.1.2 */
+/* 6.1.6 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -51,6 +51,9 @@
/* 11-09-2020 Chaoqiong Xiao Modified comment(s), */
/* added HCD uninitialize, */
/* resulting in version 6.1.2 */
+/* 04-02-2021 Chaoqiong Xiao Modified comment(s), */
+/* added port status variable, */
+/* resulting in version 6.1.6 */
/* */
/**************************************************************************/
@@ -96,6 +99,7 @@ typedef struct UX_HCD_SIM_HOST_STRUCT
*ux_hcd_sim_host_hcd_owner;
ULONG ux_hcd_sim_host_hcor;
UINT ux_hcd_sim_host_nb_root_hubs;
+ ULONG ux_hcd_sim_host_port_status[1];
struct UX_HCD_SIM_HOST_ED_STRUCT
*ux_hcd_sim_host_ed_list;
struct UX_HCD_SIM_HOST_TD_STRUCT
diff --git a/common/core/inc/ux_user_sample.h b/common/core/inc/ux_user_sample.h
index ea139cf..8142147 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.4 */
+/* 6.1.6 */
/* */
/* AUTHOR */
/* */
@@ -51,6 +51,13 @@
/* compile option for using */
/* packet pool from NetX, */
/* resulting in version 6.1.4 */
+/* 04-02-2021 Chaoqiong Xiao Modified comment(s), */
+/* added DFU_UPLOAD option, */
+/* added macro to enable */
+/* device bi-dir-endpoints, */
+/* added macro to disable CDC- */
+/* ACM transmission support, */
+/* resulting in version 6.1.6 */
/* */
/**************************************************************************/
@@ -292,6 +299,47 @@
/* #define UX_DEVICE_CLASS_HID_MAX_EVENTS_QUEUE 8 */
+
+/* Defined, this macro will disable DFU_UPLOAD support. */
+
+/* #define UX_DEVICE_CLASS_DFU_UPLOAD_DISABLE */
+
+/* Defined, this macro will enable DFU_GETSTATUS and DFU_GETSTATE in dfuERROR. */
+
+/* #define UX_DEVICE_CLASS_DFU_ERROR_GET_ENABLE */
+
+/* Defined, this macro will change status mode.
+ 0 - simple mode,
+ status is queried from application in dfuDNLOAD-SYNC and dfuMANIFEST-SYNC state,
+ no bwPollTimeout.
+ 1 - status is queried from application once requested,
+ b0-3 : media status
+ b4-7 : bStatus
+ b8-31: bwPollTimeout
+ bwPollTimeout supported.
+*/
+
+/* #define UX_DEVICE_CLASS_DFU_STATUS_MODE (1) */
+
+/* Defined, this value represents the default DFU status bwPollTimeout.
+ The value is 3 bytes long (max 0xFFFFFFu).
+ By default the bwPollTimeout is 1 (means 1ms).
+ */
+
+/* #define UX_DEVICE_CLASS_DFU_STATUS_POLLTIMEOUT (1) */
+
+/* Defined, this macro will enable custom request process callback. */
+
+/* #define UX_DEVICE_CLASS_DFU_CUSTOM_REQUEST_ENABLE */
+
+/* Defined, this macro disables CDC ACM non-blocking transmission support. */
+
+/* #define UX_DEVICE_CLASS_CDC_ACM_TRANSMISSION_DISABLE */
+
+/* Defined, this macro enables device bi-directional-endpoint support. */
+
+/* #define UX_DEVICE_BIDIRECTIONAL_ENDPOINT_SUPPORT */
+
/* Defined, this value will only enable the host side of usbx. */
/* #define UX_HOST_SIDE_ONLY */
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-13 09:36:35 +0000