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

Timestamp:

2017-10-28T16:46:54Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

6b2930b

Parents:

9868982

Message:

Ending device operation gracefully when possible.

File:

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

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

@@ -188 +188 @@
         xhci_device_t *xhci_dev = xhci_device_get(dev);
 
+        /* If the device is still attached, end DDF drivers gracefully. */
+        if (!xhci_dev->detached) {
+                if ((err = ddf_fun_offline(dev->fun))) {
+                        usb_log_warning("Failed to offline DDF function of device '%s': %s",
+                            ddf_fun_get_name(dev->fun), str_error(err));
+                }
+        }
+
         /* Block creation of new endpoints and transfers. */
         usb_log_debug2("Device '%s' going offline.", ddf_fun_get_name(dev->fun));
@@ -215 +223 @@
         /* Make DDF (and all drivers) forget about the device. */
         if ((err = ddf_fun_unbind(dev->fun))) {
-                usb_log_warning("Failed to unbind DDF function of detached device '%s': %s",
+                usb_log_warning("Failed to unbind DDF function of device '%s': %s",
                     ddf_fun_get_name(dev->fun), str_error(err));
         }
@@ -222 +230 @@
         if (!xhci_dev->detached) {
                 if ((err = hc_deconfigure_device(hc, xhci_dev->slot_id))) {
-                        usb_log_warning("Failed to deconfigure detached device '%s': %s",
+                        usb_log_warning("Failed to deconfigure device '%s': %s",
                             ddf_fun_get_name(dev->fun), str_error(err));
                 }