Changeset 7e5a12b in mainline for uspace/drv/bus/usb/xhci/bus.c

Timestamp:

2018-01-19T17:57:13Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

69b2dfee

Parents:

2833bb4

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:57:06)

git-committer:

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

Message:

xhci: make enable/disable slot symmetric

Previously, device slot context was allocated inside address_device,
complicating error paths.

File:

• uspace/drv/bus/usb/xhci/bus.c (modified) (4 diffs)

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

@@ -69 +69 @@
  * @return Error code.
  */
-static int address_device(xhci_bus_t *bus, xhci_device_t *dev)
+static int address_device(xhci_device_t *dev)
 {
         int err;
 
         /* Enable new slot. */
-        if ((err = hc_enable_slot(bus->hc, &dev->slot_id)) != EOK)
+        if ((err = hc_enable_slot(dev)) != EOK)
                 return err;
         usb_log_debug2("Obtained slot ID: %u.", dev->slot_id);
@@ -100 +100 @@
         dev->base.endpoints[0] = NULL;
 err_slot:
-        hc_disable_slot(bus->hc, dev);
+        hc_disable_slot(dev);
         return err;
 }
@@ -193 +193 @@
         do {
                 /* Assign an address to the device */
-                err = address_device(bus, xhci_dev);
+                err = address_device(xhci_dev);
         } while (err == ESTALL && --retries > 0);
 
@@ -253 +253 @@
         /* Disable the slot, dropping all endpoints. */
         const uint32_t slot_id = xhci_dev->slot_id;
-        if ((err = hc_disable_slot(bus->hc, xhci_dev))) {
+        if ((err = hc_disable_slot(xhci_dev))) {
                 usb_log_warning("Failed to disable slot of device " XHCI_DEV_FMT ": %s",
                     XHCI_DEV_ARGS(*xhci_dev), str_error(err));