Changeset a1732929 in mainline for uspace/drv/bus/usb/ehci/res.c

Timestamp:

2018-01-15T17:04:34Z (7 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.

File:

• uspace/drv/bus/usb/ehci/res.c (modified) (9 diffs)

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;