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

Timestamp:

2018-01-16T19:22:58Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

4603b35

Parents:

47e9494

Message:

usb: speed moved from default address reservation to enumeration callback

File:

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

uspace/lib/usbhost/src/bus.c

@@ -60 +60 @@
         fibril_mutex_initialize(&bus->guard);
         bus->device_size = device_size;
-        bus->default_address_speed = USB_SPEED_MAX;
 }
 
@@ -495 +494 @@
  * The speed is then used for devices enumerated while the address is reserved.
  */
-int bus_reserve_default_address(bus_t *bus, usb_speed_t speed)
+int bus_reserve_default_address(bus_t *bus, device_t *dev)
 {
         assert(bus);
 
+        int err;
         fibril_mutex_lock(&bus->guard);
-        if (bus->default_address_speed != USB_SPEED_MAX) {
-                fibril_mutex_unlock(&bus->guard);
-                return EAGAIN;
+        if (bus->default_address_owner != NULL) {
+                err = (bus->default_address_owner == dev) ? EINVAL : EAGAIN;
         } else {
-                bus->default_address_speed = speed;
-                fibril_mutex_unlock(&bus->guard);
-                return EOK;
-        }
+                bus->default_address_owner = dev;
+                err = EOK;
+        }
+        fibril_mutex_unlock(&bus->guard);
+        return err;
 }
 
@@ -513 +513 @@
  * Release the default address.
  */
-void bus_release_default_address(bus_t *bus)
+void bus_release_default_address(bus_t *bus, device_t *dev)
 {
         assert(bus);
-        bus->default_address_speed = USB_SPEED_MAX;
+
+        fibril_mutex_lock(&bus->guard);
+        if (bus->default_address_owner != dev) {
+                usb_log_error("Device %d tried to release address, which is not reserved for it.", dev->address);
+        } else {
+                bus->default_address_owner = NULL;
+        }
+        fibril_mutex_unlock(&bus->guard);
 }