Changeset 691130cf in mainline

Timestamp:

2015-08-25T04:15:27Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8351f9a4

Parents:

ff0258f

Message:

ehci/rh: Make debug messages more informative

File:

• uspace/drv/bus/usb/ehci/ehci_rh.c (modified) (5 diffs)

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

@@ -99 +99 @@
  */
 int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
-const char *name)
+    const char *name)
 {
         assert(instance);
@@ -116 +116 @@
                 usb_log_info("RH(%p): No power switching.", instance);
         }
+        for (unsigned i = 0; i < instance->port_count; ++i)
+                usb_log_debug2("RH(%p-%u): status: %"PRIx32, instance, i,
+                    EHCI_RD(regs->portsc[i]));
 
         for (unsigned i = 0; i < EHCI_MAX_PORTS; ++i) {
@@ -295 +298 @@
         /* Note feature numbers for test and indicator feature do not
          * correspond to the port status bit locations */
-        usb_log_debug2("RH(%p-%u) port status: %"PRIx32, hub, port, status);
+        usb_log_debug2("RH(%p-%u) port status: %"PRIx32"(%"PRIx32")", hub, port,
+            status, reg);
         memcpy(data, &status, sizeof(status));
         *act_size = sizeof(status);
@@ -324 +328 @@
             USB_PORTSC_ENABLED_FLAG)) {
                 usb_log_info("RH(%p-%u): Port not enabled after reset (%"PRIX32
-                "), giving up ownership", job->hub, job->port,
-                EHCI_RD(job->hub->registers->portsc[job->port]));
+                    "), giving up ownership", job->hub, job->port,
+                    EHCI_RD(job->hub->registers->portsc[job->port]));
                 EHCI_SET(job->hub->registers->portsc[job->port],
                     USB_PORTSC_PORT_OWNER_FLAG);
@@ -516 +520 @@
                 /* Write-clean bits are those that indicate change */
                 uint32_t status = EHCI_RD(hub->registers->portsc[port]);
-                if ((status & USB_PORTSC_WC_MASK)
-                    || hub->reset_flag[port] || hub->reset_flag[port]) {
+                if ((status & USB_PORTSC_WC_MASK) || hub->reset_flag[port]) {
                         /* Ignore new LS device */
                         if ((status & USB_PORTSC_CONNECT_CH_FLAG) &&