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

Timestamp:

2017-10-25T11:55:15Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2b35478

Parents:

c3d926f3

Message:

usbhost endpoint: removed target

The reasons for having usb_target_t inside endpoint have been dismissed. Enpoint is not a target of a transaction, so this was just misleading.

File:

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

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

@@ -94 +94 @@
                 /* Set up primary stream context array if needed. */
                 const size_t size = primary_stream_ctx_array_size(xhci_ep);
-                usb_log_debug2("Allocating primary stream context array of size %lu for endpoint %d:%d.",
-                    size, xhci_ep->base.target.address, xhci_ep->base.target.endpoint);
+                usb_log_debug2("Allocating primary stream context array of size %lu for endpoint " XHCI_EP_FMT,
+                    size, XHCI_EP_ARGS(*xhci_ep));
 
                 xhci_ep->primary_stream_ctx_array = malloc32(size * sizeof(xhci_stream_ctx_t));
@@ -104 +104 @@
                 memset(xhci_ep->primary_stream_ctx_array, 0, size * sizeof(xhci_stream_ctx_t));
         } else {
-                usb_log_debug2("Allocating main transfer ring for endpoint %d:%d.",
-                    xhci_ep->base.target.address, xhci_ep->base.target.endpoint);
+                usb_log_debug2("Allocating main transfer ring for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
                 xhci_ep->primary_stream_ctx_array = NULL;
@@ -121 +120 @@
 {
         if (endpoint_uses_streams(xhci_ep)) {
-                usb_log_debug2("Freeing primary stream context array for endpoint %d:%d.",
-                    xhci_ep->base.target.address, xhci_ep->base.target.endpoint);
+                usb_log_debug2("Freeing primary stream context array for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
                 // maybe check if LSA, then skip?
@@ -135 +133 @@
                 free32(xhci_ep->primary_stream_ctx_array);
         } else {
-                usb_log_debug2("Freeing main transfer ring for endpoint %d:%d.",
-                    xhci_ep->base.target.address, xhci_ep->base.target.endpoint);
+                usb_log_debug2("Freeing main transfer ring for endpoint " XHCI_EP_FMT, XHCI_EP_ARGS(*xhci_ep));
 
                 int err;
@@ -151 +148 @@
 uint8_t xhci_endpoint_dci(xhci_endpoint_t *ep)
 {
-        return (2 * ep->base.target.endpoint) +
+        return (2 * ep->base.endpoint) +
                 (ep->base.transfer_type == USB_TRANSFER_CONTROL
                  || ep->base.direction == USB_DIRECTION_IN);
@@ -280 +277 @@
         }
 
-        const usb_endpoint_t ep_num = ep->base.target.endpoint;
+        const usb_endpoint_t ep_num = ep->base.endpoint;
 
         assert(&dev->base == ep->base.device);
-        assert(dev->base.address == ep->base.target.address);
 
         // TODO Do not fail hard on runtime conditions
@@ -307 +303 @@
 {
         assert(&dev->base == ep->base.device);
-        assert(dev->base.address == ep->base.target.address);
-        assert(dev->endpoints[ep->base.target.endpoint]);
+        assert(dev->endpoints[ep->base.endpoint]);
 
         int err = ENOMEM;
-        const usb_endpoint_t ep_num = ep->base.target.endpoint;
-
-        dev->endpoints[ep->base.target.endpoint] = NULL;
+        const usb_endpoint_t ep_num = ep->base.endpoint;
+
+        dev->endpoints[ep->base.endpoint] = NULL;
         --dev->active_endpoint_count;