Changeset a1732929 in mainline for uspace/drv/bus/usb/ehci

Timestamp:

2018-01-15T17:04:34Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

9ff99e8

Parents:

c1a966e

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-15 17:04:32)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-15 17:04:34)

Message:

usb: unified logging

Use logger instead of printf. Logger adds newlines automatically.

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_batch.c (modified) (2 diffs)
• ehci_rh.c (modified) (1 diff)
• endpoint_list.c (modified) (4 diffs)
• hc.c (modified) (5 diffs)
• res.c (modified) (9 diffs)

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

@@ -143 +143 @@
         batch_setup[ehci_batch->base.ep->transfer_type](ehci_batch);
 
-        usb_log_debug("Batch %p %s " USB_TRANSFER_BATCH_FMT " initialized.\n",
+        usb_log_debug("Batch %p %s " USB_TRANSFER_BATCH_FMT " initialized.",
             ehci_batch, usb_str_direction(ehci_batch->base.dir),
             USB_TRANSFER_BATCH_ARGS(ehci_batch->base));
@@ -163 +163 @@
         assert(ehci_batch);
 
-        usb_log_debug("Batch %p: checking %zu td(s) for completion.\n",
+        usb_log_debug("Batch %p: checking %zu td(s) for completion.",
             ehci_batch, ehci_batch->td_count);
 
-        usb_log_debug2("Batch %p: QH: %08x:%08x:%08x:%08x:%08x:%08x.\n",
+        usb_log_debug2("Batch %p: QH: %08x:%08x:%08x:%08x:%08x:%08x.",
             ehci_batch,
             ehci_batch->qh->ep_char, ehci_batch->qh->ep_cap,

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

@@ -107 +107 @@
             (EHCI_RD(caps->hcsparams) >> EHCI_CAPS_HCS_N_PORTS_SHIFT) &
             EHCI_CAPS_HCS_N_PORTS_MASK;
-        usb_log_debug2("RH(%p): hcsparams: %x.\n", instance,
+        usb_log_debug2("RH(%p): hcsparams: %x.", instance,
             EHCI_RD(caps->hcsparams));
-        usb_log_info("RH(%p): Found %u ports.\n", instance,
+        usb_log_info("RH(%p): Found %u ports.", instance,
             instance->port_count);
 

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

@@ -97 +97 @@
         assert(ep);
         assert(ep->qh);
-        usb_log_debug2("EPL(%p-%s): Append endpoint(%p).\n",
+        usb_log_debug2("EPL(%p-%s): Append endpoint(%p).",
             instance, instance->name, ep);
 
@@ -128 +128 @@
         ehci_endpoint_t *first = ehci_endpoint_list_instance(
             list_first(&instance->endpoint_list));
-        usb_log_debug("EPL(%p-%s): EP(%p) added to list, first is %p(%p).\n",
+        usb_log_debug("EPL(%p-%s): EP(%p) added to list, first is %p(%p).",
             instance, instance->name, ep, first, first->qh);
         if (last_qh == instance->list_head) {
-                usb_log_debug2("EPL(%p-%s): head EP(%p-%"PRIxn"): %x:%x.\n",
+                usb_log_debug2("EPL(%p-%s): head EP(%p-%"PRIxn"): %x:%x.",
                     instance, instance->name, last_qh,
                     addr_to_phys(instance->list_head),
@@ -153 +153 @@
         fibril_mutex_lock(&instance->guard);
 
-        usb_log_debug2("EPL(%p-%s): removing EP(%p).\n",
+        usb_log_debug2("EPL(%p-%s): removing EP(%p).",
             instance, instance->name, ep);
 
@@ -172 +172 @@
         write_barrier();
 
-        usb_log_debug("EPL(%p-%s): EP(%p) removed (%s), horizontal %x.\n",
+        usb_log_debug("EPL(%p-%s): EP(%p) removed (%s), horizontal %x.",
             instance, instance->name,  ep, qpos, ep->qh->horizontal);
 

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

@@ -134 +134 @@
         EHCI_WR(code->cmds[1].value, EHCI_USED_INTERRUPTS);
 
-        usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
+        usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.",
             RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
 
@@ -160 +160 @@
         if (ret != EOK) {
                 usb_log_error("HC(%p): Failed to gain access to device "
-                    "registers: %s.\n", instance, str_error(ret));
+                    "registers: %s.", instance, str_error(ret));
                 return ret;
         }
@@ -211 +211 @@
         assert(ep);
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
-        usb_log_debug("HC(%p) enqueue EP(%d:%d:%s:%s)\n", instance,
+        usb_log_debug("HC(%p) enqueue EP(%d:%d:%s:%s)", instance,
             ep->device->address, ep->endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
@@ -235 +235 @@
         assert(ep);
         ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
-        usb_log_debug("HC(%p) dequeue EP(?:%d:%s:%s)\n", instance,
+        usb_log_debug("HC(%p) dequeue EP(?:%d:%s:%s)", instance,
             ep->endpoint,
             usb_str_transfer_type_short(ep->transfer_type),
@@ -423 +423 @@
         usb_log_debug("HC(%p): HW started.", instance);
 
-        usb_log_debug2("HC(%p): Registers: \n"
-            "\tUSBCMD(%p): %x(0x00080000 = at least 1ms between interrupts)\n"
-            "\tUSBSTS(%p): %x(0x00001000 = HC halted)\n"
-            "\tUSBINT(%p): %x(0x0 = no interrupts).\n"
-            "\tCONFIG(%p): %x(0x0 = ports controlled by companion hc).\n",
+        usb_log_debug2("HC(%p): Registers: "
+            "\tUSBCMD(%p): %x(0x00080000 = at least 1ms between interrupts)"
+            "\tUSBSTS(%p): %x(0x00001000 = HC halted)"
+            "\tUSBINT(%p): %x(0x0 = no interrupts)."
+            "\tCONFIG(%p): %x(0x0 = ports controlled by companion hc).",
             instance,
             &instance->registers->usbcmd, EHCI_RD(instance->registers->usbcmd),

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

@@ -74 +74 @@
             eecp + USBLEGSUP_OFFSET, &usblegsup);
         if (ret != EOK) {
-                usb_log_error("Failed to read USBLEGSUP: %s.\n", str_error(ret));
-                return ret;
-        }
-        usb_log_debug2("USBLEGSUP: %" PRIx32 ".\n", usblegsup);
+                usb_log_error("Failed to read USBLEGSUP: %s.", str_error(ret));
+                return ret;
+        }
+        usb_log_debug2("USBLEGSUP: %" PRIx32 ".", usblegsup);
 
         /* Request control from firmware/BIOS by writing 1 to highest
          * byte. (OS Control semaphore)*/
-        usb_log_debug("Requesting OS control.\n");
+        usb_log_debug("Requesting OS control.");
         ret = pci_config_space_write_8(parent_sess,
             eecp + USBLEGSUP_OFFSET + 3, 1);
         if (ret != EOK) {
-                usb_log_error("Failed to request OS EHCI control: %s.\n",
+                usb_log_error("Failed to request OS EHCI control: %s.",
                     str_error(ret));
                 return ret;
@@ -103 +103 @@
 
         if ((usblegsup & USBLEGSUP_BIOS_CONTROL) == 0) {
-                usb_log_info("BIOS released control after %zu usec.\n", wait);
+                usb_log_info("BIOS released control after %zu usec.", wait);
                 return EOK;
         }
@@ -109 +109 @@
         /* BIOS failed to hand over control, this should not happen. */
         usb_log_warning( "BIOS failed to release control after "
-            "%zu usecs, force it.\n", wait);
+            "%zu usecs, force it.", wait);
         ret = pci_config_space_write_32(parent_sess,
             eecp + USBLEGSUP_OFFSET, USBLEGSUP_OS_CONTROL);
         if (ret != EOK) {
-                usb_log_error("Failed to force OS control: %s.\n",
+                usb_log_error("Failed to force OS control: %s.",
                     str_error(ret));
                 return ret;
@@ -130 +130 @@
                     eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
                 if (ret != EOK) {
-                        usb_log_error("Failed to get USBLEGCTLSTS: %s.\n",
+                        usb_log_error("Failed to get USBLEGCTLSTS: %s.",
                             str_error(ret));
                         return ret;
                 }
-                usb_log_debug2("USBLEGCTLSTS: %" PRIx32 ".\n", usblegctlsts);
+                usb_log_debug2("USBLEGCTLSTS: %" PRIx32 ".", usblegctlsts);
                 /*
                  * Zero SMI enables in legacy control register.
@@ -143 +143 @@
                     eecp + USBLEGCTLSTS_OFFSET, 0xe0000000);
                 if (ret != EOK) {
-                        usb_log_error("Failed to zero USBLEGCTLSTS: %s\n",
+                        usb_log_error("Failed to zero USBLEGCTLSTS: %s",
                             str_error(ret));
                         return ret;
@@ -153 +153 @@
                     eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
                 if (ret != EOK) {
-                        usb_log_error("Failed to get USBLEGCTLSTS 2: %s.\n",
+                        usb_log_error("Failed to get USBLEGCTLSTS 2: %s.",
                             str_error(ret));
                         return ret;
                 }
-                usb_log_debug2("Zeroed USBLEGCTLSTS: %" PRIx32 ".\n",
+                usb_log_debug2("Zeroed USBLEGCTLSTS: %" PRIx32 ".",
                     usblegctlsts);
         }
@@ -165 +165 @@
             eecp + USBLEGSUP_OFFSET, &usblegsup);
         if (ret != EOK) {
-                usb_log_error("Failed to read USBLEGSUP: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
-        usb_log_debug2("USBLEGSUP: %" PRIx32 ".\n", usblegsup);
+                usb_log_error("Failed to read USBLEGSUP: %s.",
+                    str_error(ret));
+                return ret;
+        }
+        usb_log_debug2("USBLEGSUP: %" PRIx32 ".", usblegsup);
         return ret;
 }
@@ -181 +181 @@
                 return ENOMEM;
 
-        usb_log_debug("Disabling EHCI legacy support.\n");
+        usb_log_debug("Disabling EHCI legacy support.");
 
 
         const uint32_t hcc_params = EHCI_RD(hc->caps->hccparams);
-        usb_log_debug2("Value of hcc params register: %x.\n", hcc_params);
+        usb_log_debug2("Value of hcc params register: %x.", hcc_params);
 
         /* Read value of EHCI Extended Capabilities Pointer
@@ -191 +191 @@
         const uint32_t eecp =
             (hcc_params >> EHCI_CAPS_HCC_EECP_SHIFT) & EHCI_CAPS_HCC_EECP_MASK;
-        usb_log_debug2("Value of EECP: %x.\n", eecp);
+        usb_log_debug2("Value of EECP: %x.", eecp);
 
         int ret = disable_extended_caps(parent_sess, eecp);
         if (ret != EOK) {
-                usb_log_error("Failed to disable extended capabilities: %s.\n",
+                usb_log_error("Failed to disable extended capabilities: %s.",
                     str_error(ret));
                     goto clean;