Changeset 53a9d02 in mainline

Timestamp:

2018-01-11T09:17:43Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

30fc56f

Parents:

17783bf

Message:

usb: fix errors introduced by recent changes

Location:

uspace

Files:

• drv/bus/usb/ehci/ehci_bus.c (modified) (1 diff)
• drv/bus/usb/xhci/hc.c (modified) (1 diff)
• lib/usbhost/src/bus.c (modified) (3 diffs)
• lib/usbhost/src/usb2_bus.c (modified) (4 diffs)

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -101 +101 @@
         ehci_bus_t *bus = (ehci_bus_t *) bus_base;
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
-        assert(fibril_mutex_is_locked(&bus_base->guard));
 
         const int err = usb2_bus_ops.endpoint_register(ep);

uspace/drv/bus/usb/xhci/hc.c

@@ -745 +745 @@
         usb_log_debug2("Obtained USB address: %d.\n", dev->base.address);
 
-        /* From now on, the device is officially online, yay! */
-        fibril_mutex_lock(&dev->base.guard);
-        dev->base.online = true;
-        fibril_mutex_unlock(&dev->base.guard);
-
         return EOK;
 

uspace/lib/usbhost/src/bus.c

@@ -109 +109 @@
                 return ENOTSUP;
 
-        if (dev->online) {
-                fibril_mutex_unlock(&dev->guard);
+        if (dev->online)
                 return EINVAL;
-        }
 
         const int r = ops->device_enumerate(dev);
-        if (!r) {
-                dev->online = true;
-
+        if (r)
+                return r;
+
+        dev->online = true;
+
+        if (dev->hub) {
                 fibril_mutex_lock(&dev->hub->guard);
                 list_append(&dev->link, &dev->hub->devices);
@@ -123 +124 @@
         }
 
-        return r;
+        return EOK;
 }
 
@@ -192 +193 @@
 
         /* Remove our device from our hub's children. */
-        fibril_mutex_lock(&dev->hub->guard);
-        list_remove(&dev->link);
-        fibril_mutex_unlock(&dev->hub->guard);
+        if (dev->hub) {
+                fibril_mutex_lock(&dev->hub->guard);
+                list_remove(&dev->link);
+                fibril_mutex_unlock(&dev->hub->guard);
+        }
 
         /*

uspace/lib/usbhost/src/usb2_bus.c

@@ -106 +106 @@
  *
  * Reserve address, configure the control EP, issue a SET_ADDRESS command.
- * Configure the device with the new address, mark the device as online.
+ * Configure the device with the new address,
  */
 static int address_device(device_t *dev)
@@ -160 +160 @@
                 goto err_address;
         }
-        endpoint_del_ref(default_ep);
 
         dev->address = address;
@@ -173 +172 @@
         }
 
-        /* From now on, the device is officially online, yay! */
-        fibril_mutex_lock(&dev->guard);
-        dev->online = true;
-        fibril_mutex_unlock(&dev->guard);
-
         return EOK;
 
 err_default_control_ep:
         bus_endpoint_remove(default_ep);
-        endpoint_del_ref(default_ep);
 err_address:
         release_address(bus, address);
@@ -235 +228 @@
 {
         usb2_bus_t *bus = bus_to_usb2_bus(ep->device->bus);
-        assert(fibril_mutex_is_locked(&bus->base.guard));
+        assert(fibril_mutex_is_locked(&ep->device->guard));
         assert(ep);