summaryrefslogtreecommitdiff
path: root/common/usbx_host_controllers/src
diff options
context:
space:
mode:
Diffstat (limited to 'common/usbx_host_controllers/src')
-rw-r--r--common/usbx_host_controllers/src/ux_hcd_ehci_asynchronous_endpoint_create.c6
-rw-r--r--common/usbx_host_controllers/src/ux_hcd_ehci_interrupt_endpoint_create.c11
-rw-r--r--common/usbx_host_controllers/src/ux_hcd_ehci_isochronous_endpoint_create.c11
-rw-r--r--common/usbx_host_controllers/src/ux_hcd_ehci_request_control_transfer.c6
4 files changed, 22 insertions, 12 deletions
diff --git a/common/usbx_host_controllers/src/ux_hcd_ehci_asynchronous_endpoint_create.c b/common/usbx_host_controllers/src/ux_hcd_ehci_asynchronous_endpoint_create.c
index 7aa4cfa..1b66661 100644
--- a/common/usbx_host_controllers/src/ux_hcd_ehci_asynchronous_endpoint_create.c
+++ b/common/usbx_host_controllers/src/ux_hcd_ehci_asynchronous_endpoint_create.c
@@ -35,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_hcd_ehci_asynchronous_endpoint_create PORTABLE C */
-/* 6.x */
+/* 6.3.0 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -75,9 +75,9 @@
/* 11-09-2020 Chaoqiong Xiao Modified comment(s), */
/* fixed compile warnings, */
/* resulting in version 6.1.2 */
-/* xx-xx-xxxx Chaoqiong Xiao Modified comment(s), */
+/* 10-31-2023 Chaoqiong Xiao Modified comment(s), */
/* fixed compile warnings, */
-/* resulting in version 6.x */
+/* resulting in version 6.3.0 */
/* */
/**************************************************************************/
UINT _ux_hcd_ehci_asynchronous_endpoint_create(UX_HCD_EHCI *hcd_ehci, UX_ENDPOINT *endpoint)
diff --git a/common/usbx_host_controllers/src/ux_hcd_ehci_interrupt_endpoint_create.c b/common/usbx_host_controllers/src/ux_hcd_ehci_interrupt_endpoint_create.c
index 21de45b..56db575 100644
--- a/common/usbx_host_controllers/src/ux_hcd_ehci_interrupt_endpoint_create.c
+++ b/common/usbx_host_controllers/src/ux_hcd_ehci_interrupt_endpoint_create.c
@@ -35,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_hcd_ehci_interrupt_endpoint_create PORTABLE C */
-/* 6.1.11 */
+/* 6.3.0 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -104,6 +104,9 @@
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* fixed standalone compile, */
/* resulting in version 6.1.11 */
+/* 10-31-2023 Chaoqiong Xiao Modified comment(s), */
+/* fixed split transfer issue, */
+/* resulting in version 6.3.0 */
/* */
/**************************************************************************/
UINT _ux_hcd_ehci_interrupt_endpoint_create(UX_HCD_EHCI *hcd_ehci, UX_ENDPOINT *endpoint)
@@ -240,7 +243,11 @@ UINT i;
/* Keep interval < 1ms for micro-frame calculation. */
/* Make it index steps to move. */
- if (interval > 0)
+ if (interval >= 4)
+ {
+ interval = 3; /* Uses 3 for 1ms calculation */
+ }
+ else if (interval > 0)
{
interval --;
interval &= 0x3;
diff --git a/common/usbx_host_controllers/src/ux_hcd_ehci_isochronous_endpoint_create.c b/common/usbx_host_controllers/src/ux_hcd_ehci_isochronous_endpoint_create.c
index c5b4a67..761599b 100644
--- a/common/usbx_host_controllers/src/ux_hcd_ehci_isochronous_endpoint_create.c
+++ b/common/usbx_host_controllers/src/ux_hcd_ehci_isochronous_endpoint_create.c
@@ -35,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_hcd_ehci_isochronous_endpoint_create PORTABLE C */
-/* 6.x */
+/* 6.3.0 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -87,9 +87,11 @@
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
/* fixed standalone compile, */
/* resulting in version 6.1.11 */
-/* xx-xx-xxxx Chaoqiong Xiao Modified comment(s), */
+/* 10-31-2023 Chaoqiong Xiao Modified comment(s), */
+/* fixed error handling, */
+/* fixed split transfer issue, */
/* fixed compile warnings, */
-/* resulting in version 6.x */
+/* resulting in version 6.3.0 */
/* */
/**************************************************************************/
UINT _ux_hcd_ehci_isochronous_endpoint_create(UX_HCD_EHCI *hcd_ehci, UX_ENDPOINT *endpoint)
@@ -246,6 +248,7 @@ UINT status;
for (i = 0; i < ed -> ux_ehci_hsiso_ed_nb_tds; i ++)
ed -> ux_ehci_hsiso_ed_fr_td[i] -> ux_ehci_hsiso_td_status = UX_UNUSED;
_ux_utility_memory_free(ed);
+ return(status);
}
/* Save information not related to periodic things. */
@@ -496,7 +499,7 @@ UINT status;
}
/* Increment SSplit count. */
- ed_anchor -> REF_AS.ANCHOR.ux_ehci_ed_microframe_ssplit_count[i] ++;
+ ed_anchor -> REF_AS.ANCHOR.ux_ehci_ed_microframe_ssplit_count[microframe_i] ++;
}
}
diff --git a/common/usbx_host_controllers/src/ux_hcd_ehci_request_control_transfer.c b/common/usbx_host_controllers/src/ux_hcd_ehci_request_control_transfer.c
index 278715d..ca412da 100644
--- a/common/usbx_host_controllers/src/ux_hcd_ehci_request_control_transfer.c
+++ b/common/usbx_host_controllers/src/ux_hcd_ehci_request_control_transfer.c
@@ -35,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _ux_hcd_ehci_request_control_transfer PORTABLE C */
-/* 6.x */
+/* 6.3.0 */
/* AUTHOR */
/* */
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -86,9 +86,9 @@
/* refined macros names, */
/* fixed compile warnings, */
/* resulting in version 6.1.2 */
-/* xx-xx-xxxx Chaoqiong Xiao Modified comment(s), */
+/* 10-31-2023 Chaoqiong Xiao Modified comment(s), */
/* fixed compile warnings, */
-/* resulting in version 6.x */
+/* resulting in version 6.3.0 */
/* */
/**************************************************************************/
UINT _ux_hcd_ehci_request_control_transfer(UX_HCD_EHCI *hcd_ehci, UX_TRANSFER *transfer_request)