Changeset 9620a54 in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-29T10:51:59Z (8 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

d33dc780

Parents:

62f8025

Message:

Small changes. Temporarily fixed no device problem for endpoint logging. Added similar macro for device logging. Changed log messages to adopt these macros. TRB rings can be freed again. Made ring finalizers noexcept. Upon detach, the entire slot is disabled prior to unregistering endpoints in order to prevent invalid HC commands. Removed active endpoints count from XHCI device. Device context is freed in HC, so DCBAA is not touched from anywhere else.

File:

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

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

@@ -119 +119 @@
 
         if ((err = ddf_fun_bind(dev->fun))) {
-                usb_log_error("Device(%d): Failed to register: %s.", dev->address, str_error(err));
+                usb_log_error("Failed to register device " XHCI_DEV_FMT " DDF function: %s.",
+                    XHCI_DEV_ARGS(*xhci_dev), str_error(err));
                 goto err_usb_dev;
         }
@@ -185 +186 @@
         }
 
-        usb_log_info("Device '%s' at port %u has been disconnected.", ddf_fun_get_name(dev->base.fun), port_id);
+        usb_log_info("Device " XHCI_DEV_FMT " at port %u has been disconnected.",
+            XHCI_DEV_ARGS(*dev), port_id);
 
         /* Mark the device as detached. */
@@ -195 +197 @@
         /* Remove device from XHCI bus. */
         if ((err = xhci_bus_remove_device(&rh->hc->bus, rh->hc, &dev->base))) {
-                usb_log_warning("Failed to remove device '%s' from XHCI bus: %s",
-                    ddf_fun_get_name(dev->base.fun), str_error(err));
+                usb_log_warning("Failed to remove device " XHCI_DEV_FMT " from XHCI bus: %s",
+                    XHCI_DEV_ARGS(*dev), str_error(err));
         }