Changeset 1af4c00 in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2018-01-17T13:28:34Z (7 years ago)

Author:

Salmelu <salmelu@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4cc0c2e0

Parents:

61e27e80

Message:

xhci: fixed transition to and from streams

Added remove streams function to transition the endpoint back to single ring no streams mode.
Requesting streams now stops the endpoint, clears the ring and executes update endpoint command.

File:

• uspace/drv/bus/usb/xhci/endpoint.c (modified) (5 diffs)

uspace/drv/bus/usb/xhci/endpoint.c

@@ -47 +47 @@
 
 static int alloc_transfer_ds(xhci_endpoint_t *);
-static void free_transfer_ds(xhci_endpoint_t *);
 
 /**
@@ -121 +120 @@
         assert(xhci_ep);
 
-        free_transfer_ds(xhci_ep);
+        xhci_endpoint_free_transfer_ds(xhci_ep);
 
         // TODO: Something missed?
@@ -156 +155 @@
 }
 
-/** Allocate transfer data structures for XHCI endpoint.
+/** Allocate transfer data structures for XHCI endpoint not using streams.
  * @param[in] xhci_ep XHCI endpoint to allocate data structures for.
  *
@@ -166 +165 @@
         usb_log_debug2("Allocating main transfer ring for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
-        xhci_ep->primary_stream_ctx_array = NULL;
+        xhci_ep->primary_stream_data_array = NULL;
+        xhci_ep->primary_stream_data_size = 0;
 
         int err;
@@ -186 +186 @@
  * @param[in] xhci_ep XHCI endpoint to free data structures for.
  */
-static void free_transfer_ds(xhci_endpoint_t *xhci_ep)
+void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
         if (xhci_ep->primary_stream_data_size) {