Changeset a5b3de6 in mainline for uspace/lib/usbhost/src

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.

Location:

uspace/lib/usbhost/src

Files:

• hcd.c (modified) (2 diffs)
• usb2_bus.c (modified) (7 diffs)
• usb_transfer_batch.c (modified) (1 diff)

uspace/lib/usbhost/src/hcd.c

@@ -109 +109 @@
                 usb_log_error("Endpoint(%d:%d) %s needs %zu bw "
                     "but only %zu is reserved.\n",
-                    ep->target.address, ep->target.endpoint, name, bw, ep->bandwidth);
+                    device->address, ep->endpoint, name, bw, ep->bandwidth);
                 return ENOSPC;
         }
@@ -119 +119 @@
         }
 
+        batch->target = target;
         batch->buffer = data;
         batch->buffer_size = size;

uspace/lib/usbhost/src/usb2_bus.c

@@ -273 +273 @@
         usb2_bus_t *bus = bus_to_usb2_bus(bus_base);
 
-        if (!usb_address_is_valid(target.address))
-                return NULL;
+        assert(device->address == target.address);
 
         list_foreach(*get_list(bus, target.address), link, endpoint_t, ep) {
@@ -280 +279 @@
                        || (ep->direction == USB_DIRECTION_BOTH)
                        || (direction == USB_DIRECTION_BOTH))
-                    && (target.packed == ep->target.packed))
+                    && (target.endpoint == ep->endpoint))
                         return ep;
         }
@@ -296 +295 @@
 }
 
+static usb_target_t usb2_ep_to_target(endpoint_t *ep)
+{
+        assert(ep);
+        assert(ep->device);
+
+        return (usb_target_t) {{
+                .address = ep->device->address,
+                .endpoint = ep->endpoint,
+        }};
+}
+
 /** Register an endpoint to the bus. Reserves bandwidth.
  * @param bus usb_bus structure, non-null.
@@ -308 +318 @@
 
         /* Extract USB2-related information from endpoint_desc */
-        ep->target = (usb_target_t) {{
-                .address = ep->device->address,
-                .endpoint = desc->endpoint_no,
-        }};
+        ep->endpoint = desc->endpoint_no;
         ep->direction = desc->direction;
         ep->transfer_type = desc->transfer_type;
@@ -320 +327 @@
 
         /* Check for existence */
-        if (usb2_bus_find_ep(bus_base, ep->device, ep->target, ep->direction))
+        if (usb2_bus_find_ep(bus_base, ep->device, usb2_ep_to_target(ep), ep->direction))
                 return EEXIST;
 
@@ -356 +363 @@
 
         list_foreach(*get_list(bus, target.address), link, endpoint_t, ep) {
-                if ((ep->target.address == target.address)
-                    && (all || ep->target.endpoint == target.endpoint)) {
+                assert(ep->device->address == target.address);
+
+                if (all || ep->endpoint == target.endpoint) {
                         endpoint_toggle_set(ep, 0);
                         ret = EOK;
@@ -386 +394 @@
                 endpoint_t *ep = list_get_instance(link, endpoint_t, link);
                 link = list_next(link, list);
-                assert(ep->target.address == address);
+
+                assert(ep->device->address == address);
                 list_remove(&ep->link);
 
                 usb_log_warning("Endpoint %d:%d %s was left behind, removing.\n",
-                    ep->target.address, ep->target.endpoint, usb_str_direction(ep->direction));
+                    address, ep->endpoint, usb_str_direction(ep->direction));
 
                 /* Drop bus reference */

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -81 +81 @@
 
         if (batch->error == EOK && batch->toggle_reset_mode != RESET_NONE) {
-                usb_log_debug2("Reseting %s due to transaction of %d:%d.\n",
-                    batch->toggle_reset_mode == RESET_ALL ? "all EPs toggle" : "EP toggle",
-                    batch->ep->target.address, batch->ep->target.endpoint);
-                bus_reset_toggle(batch->ep->bus,
-                    batch->ep->target, batch->toggle_reset_mode == RESET_ALL);
+                usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " resets %s",
+                    batch, USB_TRANSFER_BATCH_ARGS(*batch),
+                    batch->toggle_reset_mode == RESET_ALL ? "all EPs toggle" : "EP toggle");
+                bus_reset_toggle(batch->ep->bus, 
+                    batch->target, batch->toggle_reset_mode == RESET_ALL);
         }