summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuxin Zhou <[email protected]>2021-02-28 04:54:47 +0000
committerYuxin Zhou <[email protected]>2021-02-28 04:54:47 +0000
commitedb7e7d00bb323e6c768175a8085361d7f6c48eb (patch)
treeb3739e3cc99ba99989025f49fb4b3140fbd449d8
parent5d2acef877e3a9215ef495bf350fbceb06349bb5 (diff)
Release 6.1.5v6.1.5_rel
-rwxr-xr-xcommon/core/inc/ux_api.h6
-rw-r--r--common/usbx_device_classes/src/ux_device_class_cdc_acm_ioctl.c7
2 files changed, 8 insertions, 5 deletions
diff --git a/common/core/inc/ux_api.h b/common/core/inc/ux_api.h
index 7932d79..11969cc 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.4 */
+/* 6.1.5 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -81,6 +81,8 @@
/* added events for device */
/* connection/disconnection, */
/* resulting in version 6.1.4 */
+/* 03-02-2021 Chaoqiong Xiao Modified comment(s), */
+/* resulting in version 6.1.5 */
/* */
/**************************************************************************/
@@ -215,7 +217,7 @@ typedef signed char SCHAR;
#define AZURE_RTOS_USBX
#define USBX_MAJOR_VERSION 6
#define USBX_MINOR_VERSION 1
-#define USBX_PATCH_VERSION 4
+#define USBX_PATCH_VERSION 5
/* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens. */
diff --git a/common/usbx_device_classes/src/ux_device_class_cdc_acm_ioctl.c b/common/usbx_device_classes/src/ux_device_class_cdc_acm_ioctl.c
index c1488be..8c42688 100644
--- a/common/usbx_device_classes/src/ux_device_class_cdc_acm_ioctl.c
+++ b/common/usbx_device_classes/src/ux_device_class_cdc_acm_ioctl.c
@@ -34,7 +34,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_device_class_cdc_acm_ioctl PORTABLE C */
-/* 6.1 */
+/* 6.1.5 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -76,6 +76,9 @@
/* TX symbols instead of using */
/* them directly, */
/* resulting in version 6.1 */
+/* 03-02-2021 Xiuwen Cai Modified comment(s), removed */
+/* unreachable statement, */
+/* resulting in version 6.1.5 */
/* */
/**************************************************************************/
UINT _ux_device_class_cdc_acm_ioctl(UX_SLAVE_CLASS_CDC_ACM *cdc_acm, ULONG ioctl_function,
@@ -348,8 +351,6 @@ UX_SLAVE_TRANSFER *transfer_request;
/* We are done here. */
return(UX_SUCCESS);
-
- break;
case UX_SLAVE_CLASS_CDC_ACM_IOCTL_TRANSMISSION_STOP: