Changeset 5e2b1ae6 in mainline for uspace/lib/usbhost/src/bus.c

Timestamp:

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

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3dc3f99

Parents:

63431db

Message:

usbhost: reserve default speed in library

File:

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

uspace/lib/usbhost/src/bus.c

@@ -54 +54 @@
         fibril_mutex_initialize(&bus->guard);
         bus->device_size = device_size;
+        bus->default_address_speed = USB_SPEED_MAX;
 }
 
@@ -239 +240 @@
         assert(bus);
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, reserve_default_address);
-        if (!ops)
-                return ENOTSUP;
-
         fibril_mutex_lock(&bus->guard);
-        const int r = ops->reserve_default_address(bus, speed);
-        fibril_mutex_unlock(&bus->guard);
-        return r;
-}
-
-int bus_release_default_address(bus_t *bus)
+        if (bus->default_address_speed != USB_SPEED_MAX) {
+                fibril_mutex_unlock(&bus->guard);
+                return EAGAIN;
+        } else {
+                bus->default_address_speed = speed;
+                fibril_mutex_unlock(&bus->guard);
+                return EOK;
+        }
+}
+
+void bus_release_default_address(bus_t *bus)
 {
         assert(bus);
-
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, release_default_address);
-        if (!ops)
-                return ENOTSUP;
-
-        fibril_mutex_lock(&bus->guard);
-        const int r = ops->release_default_address(bus);
-        fibril_mutex_unlock(&bus->guard);
-        return r;
+        bus->default_address_speed = USB_SPEED_MAX;
 }