Changeset a1732929 in mainline for uspace/drv/bus/usb/uhci/uhci_rh.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/uhci/uhci_rh.c (modified) (8 diffs)

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -202 +202 @@
         data[0] = ((value & STATUS_LINE_D_MINUS) ? 1 : 0)
             | ((value & STATUS_LINE_D_PLUS) ? 2 : 0);
-        RH_DEBUG(hub, port, "Bus state %" PRIx8 "(source %" PRIx16")\n",
+        RH_DEBUG(hub, port, "Bus state %" PRIx8 "(source %" PRIx16")",
             data[0], value);
         *act_size = 1;
@@ -248 +248 @@
         );
         RH_DEBUG(hub, port, "Port status %" PRIx32 " (source %" PRIx16
-            "%s)\n", uint32_usb2host(status), val,
+            "%s)", uint32_usb2host(status), val,
             hub->reset_changed[port] ? "-reset" : "");
         memcpy(data, &status, sizeof(status));
@@ -276 +276 @@
         case USB_HUB_FEATURE_PORT_ENABLE:
                 RH_DEBUG(hub, port, "Clear port enable (status %"
-                    PRIx16 ")\n", status);
+                    PRIx16 ")", status);
                 pio_write_16(hub->ports[port], val & ~STATUS_ENABLED);
                 break;
         case USB_HUB_FEATURE_PORT_SUSPEND:
                 RH_DEBUG(hub, port, "Clear port suspend (status %"
-                    PRIx16 ")\n", status);
+                    PRIx16 ")", status);
                 pio_write_16(hub->ports[port], val & ~STATUS_SUSPEND);
                 // TODO we should do resume magic
-                usb_log_warning("Resume is not implemented on port %u\n", port);
+                usb_log_warning("Resume is not implemented on port %u", port);
                 break;
         case USB_HUB_FEATURE_PORT_POWER:
-                RH_DEBUG(hub, port, "Clear port power (status %" PRIx16 ")\n",
+                RH_DEBUG(hub, port, "Clear port power (status %" PRIx16 ")",
                     status);
                 /* We are always powered */
-                usb_log_warning("Tried to power off port %u\n", port);
+                usb_log_warning("Tried to power off port %u", port);
                 break;
         case USB_HUB_FEATURE_C_PORT_CONNECTION:
                 RH_DEBUG(hub, port, "Clear port conn change (status %"
-                    PRIx16 ")\n", status);
+                    PRIx16 ")", status);
                 pio_write_16(hub->ports[port], val | STATUS_CONNECTED_CHANGED);
                 break;
         case USB_HUB_FEATURE_C_PORT_RESET:
                 RH_DEBUG(hub, port, "Clear port reset change (status %"
-                    PRIx16 ")\n", status);
+                    PRIx16 ")", status);
                 hub->reset_changed[port] = false;
                 break;
         case USB_HUB_FEATURE_C_PORT_ENABLE:
                 RH_DEBUG(hub, port, "Clear port enable change (status %"
-                    PRIx16 ")\n", status);
+                    PRIx16 ")", status);
                 pio_write_16(hub->ports[port], status | STATUS_ENABLED_CHANGED);
                 break;
         case USB_HUB_FEATURE_C_PORT_SUSPEND:
                 RH_DEBUG(hub, port, "Clear port suspend change (status %"
-                    PRIx16 ")\n", status);
+                    PRIx16 ")", status);
                 //TODO
                 return ENOTSUP;
         case USB_HUB_FEATURE_C_PORT_OVER_CURRENT:
                 RH_DEBUG(hub, port, "Clear port OC change (status %"
-                    PRIx16 ")\n", status);
+                    PRIx16 ")", status);
                 /* UHCI Does not report over current */
                 //TODO: newer chips do, but some have broken wiring
@@ -320 +320 @@
         default:
                 RH_DEBUG(hub, port, "Clear unknown feature %d (status %"
-                    PRIx16 ")\n", feature, status);
-                usb_log_warning("Clearing feature %d is unsupported\n",
+                    PRIx16 ")", feature, status);
+                usb_log_warning("Clearing feature %d is unsupported",
                     feature);
                 return ESTALL;
@@ -348 +348 @@
         case USB_HUB_FEATURE_PORT_RESET:
                 RH_DEBUG(hub, port, "Set port reset before (status %" PRIx16
-                    ")\n", status);
+                    ")", status);
                 uhci_port_reset_enable(hub->ports[port]);
                 hub->reset_changed[port] = true;
                 RH_DEBUG(hub, port, "Set port reset after (status %" PRIx16
-                    ")\n", pio_read_16(hub->ports[port]));
+                    ")", pio_read_16(hub->ports[port]));
                 break;
         case USB_HUB_FEATURE_PORT_SUSPEND:
                 RH_DEBUG(hub, port, "Set port suspend (status %" PRIx16
-                    ")\n", status);
+                    ")", status);
                 pio_write_16(hub->ports[port],
                     (status & ~STATUS_WC_BITS) | STATUS_SUSPEND);
-                usb_log_warning("Suspend is not implemented on port %u\n", port);
+                usb_log_warning("Suspend is not implemented on port %u", port);
                 break;
         case USB_HUB_FEATURE_PORT_POWER:
                 RH_DEBUG(hub, port, "Set port power (status %" PRIx16
-                    ")\n", status);
+                    ")", status);
                 /* We are always powered */
-                usb_log_warning("Tried to power port %u\n", port);
+                usb_log_warning("Tried to power port %u", port);
                 break;
         case USB_HUB_FEATURE_C_PORT_CONNECTION:
@@ -372 +372 @@
         case USB_HUB_FEATURE_C_PORT_OVER_CURRENT:
                 RH_DEBUG(hub, port, "Set port change flag (status %" PRIx16
-                    ")\n", status);
+                    ")", status);
                 /* These are voluntary and don't have to be set
                  * there is no way we could do it on UHCI anyway */
@@ -378 +378 @@
         default:
                 RH_DEBUG(hub, port, "Set unknown feature %d (status %" PRIx16
-                    ")\n", feature, status);
-                usb_log_warning("Setting feature %d is unsupported\n",
+                    ")", feature, status);
+                usb_log_warning("Setting feature %d is unsupported",
                     feature);
                 return ESTALL;
@@ -418 +418 @@
                 RH_DEBUG(hub, -1, "Event mask %" PRIx8
                     " (status_a %" PRIx16 "%s),"
-                    " (status_b %" PRIx16 "%s)\n", status,
+                    " (status_b %" PRIx16 "%s)", status,
                     status_a, hub->reset_changed[0] ? "-reset" : "",
                     status_b, hub->reset_changed[1] ? "-reset" : "" );