Changeset 56257ba in mainline for uspace/lib/usbhost/src/bus.c

Timestamp:

2018-01-07T01:01:42Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

63431db

Parents:

9efad54

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-07 01:01:41)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-07 01:01:42)

Message:

usbhost: manage endpoints by library + get/set_toggle → reset_toggle

That simplifies things A LOT. Now you can find endpoints for device in
an array inside device. This array is managed automatically in
register/unregister endpoint. HC drivers still needs to write to it when
setting up/tearing down the device.

Sorry for these two changes being in one commit, but splitting them
would be simply more work for no benefit.

File:

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

uspace/lib/usbhost/src/bus.c

@@ -99 +99 @@
 
         const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_remove);
-
         if (!ops)
                 return ENOTSUP;
@@ -162 +161 @@
 
         fibril_mutex_lock(&bus->guard);
-        err = register_ops->endpoint_register(ep);
-        fibril_mutex_unlock(&bus->guard);
+        if (!device->online && ep->endpoint != 0) {
+                err = EAGAIN;
+        } else if (device->endpoints[ep->endpoint] != NULL) {
+                err = EEXIST;
+        } else {
+                err = register_ops->endpoint_register(ep);
+                if (!err)
+                        device->endpoints[ep->endpoint] = ep;
+        }
+        fibril_mutex_unlock(&bus->guard);
+        if (err) {
+                endpoint_del_ref(ep);
+                return err;
+        }
 
         if (out_ep) {
@@ -171 +182 @@
         }
 
-        return err;
+        return EOK;
 }
 
 /** Searches for an endpoint. Returns a reference.
  */
-endpoint_t *bus_find_endpoint(device_t *device, usb_target_t endpoint, usb_direction_t dir)
+endpoint_t *bus_find_endpoint(device_t *device, usb_endpoint_t endpoint)
 {
         assert(device);
@@ -182 +193 @@
         bus_t *bus = device->bus;
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, device_find_endpoint);
-        if (!ops)
-                return NULL;
-
-        fibril_mutex_lock(&bus->guard);
-        endpoint_t *ep = ops->device_find_endpoint(device, endpoint, dir);
+        fibril_mutex_lock(&bus->guard);
+        endpoint_t *ep = device->endpoints[endpoint];
         if (ep) {
                 /* Exporting reference */
                 endpoint_add_ref(ep);
         }
-
         fibril_mutex_unlock(&bus->guard);
         return ep;
@@ -201 +207 @@
         assert(ep);
         assert(ep->device);
-        assert(ep->device->bus);
-        assert(ep->device->bus->ops);
 
         bus_t *bus = endpoint_get_bus(ep);
@@ -218 +222 @@
         fibril_mutex_lock(&bus->guard);
         const int r = ops->endpoint_unregister(ep);
+        if (!r)
+                ep->device->endpoints[ep->endpoint] = NULL;
         fibril_mutex_unlock(&bus->guard);
 
@@ -253 +259 @@
         fibril_mutex_lock(&bus->guard);
         const int r = ops->release_default_address(bus);
-        fibril_mutex_unlock(&bus->guard);
-        return r;
-}
-
-int bus_reset_toggle(bus_t *bus, usb_target_t target, bool all)
-{
-        assert(bus);
-
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, reset_toggle);
-        if (!ops)
-                return ENOTSUP;
-
-        fibril_mutex_lock(&bus->guard);
-        const int r = ops->reset_toggle(bus, target, all);
         fibril_mutex_unlock(&bus->guard);
         return r;
@@ -288 +280 @@
 
         /* Temporary reference */
-        endpoint_t *ep = bus_find_endpoint(device, target, direction);
+        endpoint_t *ep = bus_find_endpoint(device, target.endpoint);
         if (ep == NULL) {
                 usb_log_error("Endpoint(%d:%d) not registered for %s.\n",