Changeset 1ed3eb4 in mainline for uspace/lib/usbhost/src/bus.c

Timestamp:

2018-01-13T19:13:04Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2489353

Parents:

001778c

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-13 19:12:34)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-13 19:13:04)

Message:

usbhost: endpoint is identified also by its direction

File:

• uspace/lib/usbhost/src/bus.c (modified) (5 diffs)

uspace/lib/usbhost/src/bus.c

@@ -307 +307 @@
 err:
         return rc;
+}
+
+/**
+ * Calculate an index to the endpoint array.
+ * For the default control endpoint 0, it must return 0.
+ * For different arguments, the result is stable but not defined.
+ */
+static int bus_endpoint_index(usb_endpoint_t ep, usb_direction_t dir)
+{
+        return 2 * ep + (dir == USB_DIRECTION_OUT);
 }
 
@@ -357 +367 @@
             ep->max_transfer_size);
 
+        const int idx = bus_endpoint_index(ep->endpoint, ep->direction);
+
         fibril_mutex_lock(&device->guard);
         if (!device->online && ep->endpoint != 0) {
                 err = EAGAIN;
-        } else if (device->endpoints[ep->endpoint] != NULL) {
+        } else if (device->endpoints[idx] != NULL) {
                 err = EEXIST;
         } else {
                 err = register_ops->endpoint_register(ep);
                 if (!err)
-                        device->endpoints[ep->endpoint] = ep;
+                        device->endpoints[idx] = ep;
         }
         fibril_mutex_unlock(&device->guard);
@@ -385 +397 @@
  * Search for an endpoint. Returns a reference.
  */
-endpoint_t *bus_find_endpoint(device_t *device, usb_endpoint_t endpoint)
+endpoint_t *bus_find_endpoint(device_t *device, usb_endpoint_t endpoint, usb_direction_t dir)
 {
         assert(device);
 
+        const int idx = bus_endpoint_index(endpoint, dir);
+        const int ctrl_idx = bus_endpoint_index(endpoint, USB_DIRECTION_BOTH);
+
         fibril_mutex_lock(&device->guard);
-        endpoint_t *ep = device->endpoints[endpoint];
+        endpoint_t *ep = device->endpoints[idx];
+        /*
+         * If the endpoint was not found, it's still possible it is a control
+         * endpoint having direction BOTH.
+         */
+        if (!ep) {
+                ep = device->endpoints[ctrl_idx];
+                if (ep && ep->transfer_type != USB_TRANSFER_CONTROL)
+                        ep = NULL;
+        }
         if (ep) {
                 /* Exporting reference */
@@ -423 +447 @@
             ep->max_transfer_size);
 
+        const int idx = bus_endpoint_index(ep->endpoint, ep->direction);
+
         fibril_mutex_lock(&device->guard);
         ops->endpoint_unregister(ep);
-        device->endpoints[ep->endpoint] = NULL;
+        device->endpoints[idx] = NULL;
         fibril_mutex_unlock(&device->guard);
 
@@ -489 +515 @@
 
         /* Temporary reference */
-        endpoint_t *ep = bus_find_endpoint(device, target.endpoint);
+        endpoint_t *ep = bus_find_endpoint(device, target.endpoint, direction);
         if (ep == NULL) {
                 usb_log_error("Endpoint(%d:%d) not registered for %s.\n",