summaryrefslogtreecommitdiff
path: root/common/usbx_host_controllers
diff options
context:
space:
mode:
Diffstat (limited to 'common/usbx_host_controllers')
-rwxr-xr-xcommon/usbx_host_controllers/inc/ux_hcd_ehci.h25
-rwxr-xr-xcommon/usbx_host_controllers/inc/ux_hcd_ohci.h22
-rw-r--r--common/usbx_host_controllers/src/ux_hcd_ehci_initialize.c7
-rw-r--r--common/usbx_host_controllers/src/ux_hcd_ehci_port_reset.c7
-rw-r--r--common/usbx_host_controllers/src/ux_hcd_ehci_port_status_get.c7
-rwxr-xr-xcommon/usbx_host_controllers/src/ux_hcd_ehci_transfer_abort.c7
6 files changed, 64 insertions, 11 deletions
diff --git a/common/usbx_host_controllers/inc/ux_hcd_ehci.h b/common/usbx_host_controllers/inc/ux_hcd_ehci.h
index 2154558..036bbf0 100755
--- a/common/usbx_host_controllers/inc/ux_hcd_ehci.h
+++ b/common/usbx_host_controllers/inc/ux_hcd_ehci.h
@@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_hcd_ehci.h PORTABLE C */
-/* 6.1.2 */
+/* 6.1.8 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -50,14 +50,29 @@
/* used unsigned defines, */
/* named unions and structs, */
/* resulting in version 6.1.2 */
+/* 08-02-2021 Chaoqiong Xiao Modified comment(s), */
+/* fixed spelling error, */
+/* added extern "C" keyword */
+/* for compatibility with C++, */
+/* resulting in version 6.1.8 */
/* */
/**************************************************************************/
#ifndef UX_HCD_EHCI_H
#define UX_HCD_EHCI_H
+/* Determine if a C++ compiler is being used. If so, ensure that standard
+ C is used to process the API information. */
-/* Possible defined EHCI HCD extentions. */
+#ifdef __cplusplus
+
+/* Yes, C++ compiler is present. Use standard C. */
+extern "C" {
+
+#endif
+
+
+/* Possible defined EHCI HCD extensions. */
/* Extension for peripheral host mode select (function like). */
/* #define UX_HCD_EHCI_EXT_USB_HOST_MODE_ENABLE(hcd_ehci) */
@@ -827,5 +842,11 @@ VOID _ux_hcd_ehci_transfer_request_process(UX_TRANSFER *transfer_request);
#define ux_hcd_ehci_initialize _ux_hcd_ehci_initialize
#define ux_hcd_ehci_interrupt_handler _ux_hcd_ehci_interrupt_handler
+/* Determine if a C++ compiler is being used. If so, complete the standard
+ C conditional started above. */
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/common/usbx_host_controllers/inc/ux_hcd_ohci.h b/common/usbx_host_controllers/inc/ux_hcd_ohci.h
index 47de75e..f18977e 100755
--- a/common/usbx_host_controllers/inc/ux_hcd_ohci.h
+++ b/common/usbx_host_controllers/inc/ux_hcd_ohci.h
@@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */
/* */
/* ux_hcd_ohci.h PORTABLE C */
-/* 6.1.2 */
+/* 6.1.8 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -46,12 +46,26 @@
/* 11-09-2020 Chaoqiong Xiao Modified comment(s), */
/* used unsigned defines, */
/* resulting in version 6.1.2 */
+/* 08-02-2021 Chaoqiong Xiao Modified comment(s), */
+/* added extern "C" keyword */
+/* for compatibility with C++, */
+/* resulting in version 6.1.8 */
/* */
/**************************************************************************/
#ifndef UX_HCD_OHCI_H
#define UX_HCD_OHCI_H
+/* Determine if a C++ compiler is being used. If so, ensure that standard
+ C is used to process the API information. */
+
+#ifdef __cplusplus
+
+/* Yes, C++ compiler is present. Use standard C. */
+extern "C" {
+
+#endif
+
/* Define generic OHCI constants. */
@@ -394,5 +408,11 @@ VOID _ux_hcd_ohci_transfer_request_process(UX_TRANSFER *transfer_request);
#define ux_hcd_ohci_initialize _ux_hcd_ohci_initialize
#define ux_hcd_ohci_interrupt_handler _ux_hcd_ohci_interrupt_handler
+/* Determine if a C++ compiler is being used. If so, complete the standard
+ C conditional started above. */
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/common/usbx_host_controllers/src/ux_hcd_ehci_initialize.c b/common/usbx_host_controllers/src/ux_hcd_ehci_initialize.c
index 347bc09..c8cd707 100644
--- a/common/usbx_host_controllers/src/ux_hcd_ehci_initialize.c
+++ b/common/usbx_host_controllers/src/ux_hcd_ehci_initialize.c
@@ -30,7 +30,7 @@
#include "ux_host_stack.h"
-/* EHCI HCD extention for host mode select. */
+/* EHCI HCD extension for host mode select. */
#ifndef UX_HCD_EHCI_EXT_USB_HOST_MODE_ENABLE
#if defined(K66) || defined(IMX6UL) || defined(XILINX_ZYNQ) || defined(MIMXRT)
@@ -60,7 +60,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_hcd_ehci_initialize PORTABLE C */
-/* 6.1 */
+/* 6.1.8 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -108,6 +108,9 @@
/* optimized based on compile */
/* definitions, */
/* resulting in version 6.1 */
+/* 08-02-2021 Wen Wang Modified comment(s), */
+/* fixed spelling error, */
+/* resulting in version 6.1.8 */
/* */
/**************************************************************************/
UINT _ux_hcd_ehci_initialize(UX_HCD *hcd)
diff --git a/common/usbx_host_controllers/src/ux_hcd_ehci_port_reset.c b/common/usbx_host_controllers/src/ux_hcd_ehci_port_reset.c
index 10cdc2e..bcc281d 100644
--- a/common/usbx_host_controllers/src/ux_hcd_ehci_port_reset.c
+++ b/common/usbx_host_controllers/src/ux_hcd_ehci_port_reset.c
@@ -30,7 +30,7 @@
#include "ux_host_stack.h"
-/* EHCI HCD extention for host mode select. */
+/* EHCI HCD extension for host mode select. */
#ifndef UX_HCD_EHCI_EXT_USBPHY_HIGHSPEED_MODE_SET
#if defined(K66)
@@ -88,7 +88,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_hcd_ehci_port_reset PORTABLE C */
-/* 6.1 */
+/* 6.1.8 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -124,6 +124,9 @@
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
/* fixed NXP register base, */
/* resulting in version 6.1 */
+/* 08-02-2021 Wen Wang Modified comment(s), */
+/* fixed spelling error, */
+/* resulting in version 6.1.8 */
/* */
/**************************************************************************/
UINT _ux_hcd_ehci_port_reset(UX_HCD_EHCI *hcd_ehci, ULONG port_index)
diff --git a/common/usbx_host_controllers/src/ux_hcd_ehci_port_status_get.c b/common/usbx_host_controllers/src/ux_hcd_ehci_port_status_get.c
index 21fb027..cee1a41 100644
--- a/common/usbx_host_controllers/src/ux_hcd_ehci_port_status_get.c
+++ b/common/usbx_host_controllers/src/ux_hcd_ehci_port_status_get.c
@@ -30,7 +30,7 @@
#include "ux_host_stack.h"
-/* EHCI HCD extention for host mode select. */
+/* EHCI HCD extension for host mode select. */
#ifndef UX_HCD_EHCI_EXT_USBPHY_HIGHSPEED_MODE_SET
#if defined(K66)
@@ -88,7 +88,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_hcd_ehci_port_status_get PORTABLE C */
-/* 6.1 */
+/* 6.1.8 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -147,6 +147,9 @@
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
/* fixed NXP register base, */
/* resulting in version 6.1 */
+/* 08-02-2021 Wen Wang Modified comment(s), */
+/* fixed spelling error, */
+/* resulting in version 6.1.8 */
/* */
/**************************************************************************/
ULONG _ux_hcd_ehci_port_status_get(UX_HCD_EHCI *hcd_ehci, ULONG port_index)
diff --git a/common/usbx_host_controllers/src/ux_hcd_ehci_transfer_abort.c b/common/usbx_host_controllers/src/ux_hcd_ehci_transfer_abort.c
index aa12ab0..74c280c 100755
--- a/common/usbx_host_controllers/src/ux_hcd_ehci_transfer_abort.c
+++ b/common/usbx_host_controllers/src/ux_hcd_ehci_transfer_abort.c
@@ -35,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_hcd_ehci_transfer_abort PORTABLE C */
-/* 6.1.2 */
+/* 6.1.8 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -59,7 +59,7 @@
/* _ux_utility_virtual_address Get virtual address */
/* _ux_utility_mutex_on Get mutex */
/* _ux_utility_mutex_off Put mutex */
-/* _ux_utility_delay_ms Delay miliseconds */
+/* _ux_utility_delay_ms Delay milliseconds */
/* _ux_hcd_ehci_ed_clean Clean TDs on ED */
/* */
/* CALLED BY */
@@ -76,6 +76,9 @@
/* 11-09-2020 Chaoqiong Xiao Modified comment(s), */
/* fixed compile warnings, */
/* resulting in version 6.1.2 */
+/* 08-02-2021 Wen Wang Modified comment(s), */
+/* fixed spelling error, */
+/* resulting in version 6.1.8 */
/* */
/**************************************************************************/
UINT _ux_hcd_ehci_transfer_abort(UX_HCD_EHCI *hcd_ehci,UX_TRANSFER *transfer_request)
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-13 12:29:43 +0000