Changeset 0eadfd1e in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2018-01-09T14:14:32Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

dfa1fc8

Parents:

17c5e62

Message:

xhci: allocate/free transfer ring internally in endpoint init/fini

File:

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

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

@@ -45 +45 @@
 #include "endpoint.h"
 
+static int alloc_transfer_ds(xhci_endpoint_t *);
+static void free_transfer_ds(xhci_endpoint_t *);
+
 /**
  * Initialize new XHCI endpoint.
@@ -55 +58 @@
 int xhci_endpoint_init(xhci_endpoint_t *xhci_ep, device_t *dev, const usb_endpoint_descriptors_t *desc)
 {
+        int rc;
         assert(xhci_ep);
 
@@ -103 +107 @@
         }
 
+        if ((rc = alloc_transfer_ds(xhci_ep)))
+                goto err;
+
         return EOK;
+
+err:
+        return rc;
 }
 
@@ -113 +123 @@
 {
         assert(xhci_ep);
+
+        free_transfer_ds(xhci_ep);
 
         // TODO: Something missed?
@@ -291 +303 @@
  * @return Error code.
  */
-int xhci_endpoint_alloc_transfer_ds(xhci_endpoint_t *xhci_ep)
+static int alloc_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
         /* Can't use XHCI_EP_FMT because the endpoint may not have device. */
@@ -316 +328 @@
  * @param[in] xhci_ep XHCI endpoint to free data structures for.
  */
-void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *xhci_ep)
+static void free_transfer_ds(xhci_endpoint_t *xhci_ep)
 {
         if (endpoint_using_streams(xhci_ep)) {