Changeset a1732929 in mainline for uspace/drv/bus/usb/ohci/ohci_rh.c

Timestamp:

2018-01-15T17:04:34Z (6 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/ohci/ohci_rh.c (modified) (6 diffs)

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -114 +114 @@
         instance->registers = regs;
         instance->port_count = OHCI_RD(regs->rh_desc_a) & RHDA_NDS_MASK;
-        usb_log_debug2("rh_desc_a: %x.\n", OHCI_RD(regs->rh_desc_a));
+        usb_log_debug2("rh_desc_a: %x.", OHCI_RD(regs->rh_desc_a));
         if (instance->port_count > OHCI_MAX_PORTS) {
                 usb_log_warning("OHCI specification does not allow %d ports. "
-                    "Max %d ports will be used.\n", instance->port_count,
+                    "Max %d ports will be used.", instance->port_count,
                     OHCI_MAX_PORTS);
                 instance->port_count = OHCI_MAX_PORTS;
         }
-        usb_log_info("%s: Found %u ports.\n", name, instance->port_count);
+        usb_log_info("%s: Found %u ports.", name, instance->port_count);
 
 #if defined OHCI_POWER_SWITCH_no
-        usb_log_info("%s: Set power mode to no power switching.\n", name);
+        usb_log_info("%s: Set power mode to no power switching.", name);
         /* Set port power mode to no power-switching. (always on) */
         OHCI_SET(regs->rh_desc_a, RHDA_NPS_FLAG);
@@ -132 +132 @@
 
 #elif defined OHCI_POWER_SWITCH_ganged
-        usb_log_info("%s: Set power mode to ganged power switching.\n", name);
+        usb_log_info("%s: Set power mode to ganged power switching.", name);
         /* Set port power mode to ganged power-switching. */
         OHCI_CLR(regs->rh_desc_a, RHDA_NPS_FLAG);
@@ -144 +144 @@
         OHCI_CLR(regs->rh_desc_a, RHDA_OCPM_FLAG);
 #else
-        usb_log_info("%s: Set power mode to per-port power switching.\n", name);
+        usb_log_info("%s: Set power mode to per-port power switching.", name);
         /* Set port power mode to per port power-switching. */
         OHCI_CLR(regs->rh_desc_a, RHDA_NPS_FLAG);
@@ -356 +356 @@
         case USB_HUB_FEATURE_C_PORT_RESET:        /*20*/
                 usb_log_debug2("Clearing port C_CONNECTION, C_ENABLE, "
-                    "C_SUSPEND, C_OC or C_RESET on port %u.\n", port);
+                    "C_SUSPEND, C_OC or C_RESET on port %u.", port);
                 /* Bit offsets correspond to the feature number */
                 OHCI_WR(hub->registers->rh_port_status[port],
@@ -405 +405 @@
         case USB_HUB_FEATURE_PORT_RESET:   /*4*/
                 usb_log_debug2("Setting port POWER, ENABLE, SUSPEND or RESET "
-                    "on port %u.\n", port);
+                    "on port %u.", port);
                 /* Bit offsets correspond to the feature number */
                 OHCI_WR(hub->registers->rh_port_status[port], 1 << feature);
@@ -451 +451 @@
         }
 
-        usb_log_debug2("OHCI root hub interrupt mask: %hx.\n", mask);
+        usb_log_debug2("OHCI root hub interrupt mask: %hx.", mask);
 
         if (mask == 0)