Changeset a1732929 in mainline for uspace/lib/usbhost/src/hcd.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/lib/usbhost/src/hcd.c (modified) (11 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -169 +169 @@
         const int irq = hc_driver->irq_code_gen(&irq_code, hcd, hw_res);
         if (irq < 0) {
-                usb_log_error("Failed to generate IRQ code: %s.\n",
+                usb_log_error("Failed to generate IRQ code: %s.",
                     str_error(irq));
                 return irq;
@@ -178 +178 @@
         irq_code_clean(&irq_code);
         if (irq_cap < 0) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
+                usb_log_error("Failed to register interrupt handler: %s.",
                     str_error(irq_cap));
                 return irq_cap;
@@ -186 +186 @@
         int ret = hcd_ddf_enable_interrupt(hcd, irq);
         if (ret != EOK) {
-                usb_log_error("Failed to enable interrupts: %s.\n",
+                usb_log_error("Failed to enable interrupts: %s.",
                     str_error(ret));
                 unregister_interrupt_handler(hcd->ddf_dev, irq_cap);
@@ -219 +219 @@
         ret = hcd_ddf_setup_hc(device, hc_driver->hc_device_size);
         if (ret != EOK) {
-                usb_log_error("Failed to setup HC device.\n");
+                usb_log_error("Failed to setup HC device.");
                 return ret;
         }
@@ -229 +229 @@
         if (ret != EOK) {
                 usb_log_error("Failed to get register memory addresses "
-                    "for `%s': %s.\n", ddf_dev_get_name(device),
+                    "for `%s': %s.", ddf_dev_get_name(device),
                     str_error(ret));
                 goto err_hcd;
@@ -236 +236 @@
         ret = hc_driver->hc_add(hcd, &hw_res);
         if (ret != EOK) {
-                usb_log_error("Failed to init HCD.\n");
+                usb_log_error("Failed to init HCD.");
                 goto err_hw_res;
         }
@@ -245 +245 @@
         hcd->irq_cap = hcd_ddf_setup_interrupts(hcd, &hw_res);
         if (hcd->irq_cap >= 0) {
-                usb_log_debug("Hw interrupts enabled.\n");
+                usb_log_debug("Hw interrupts enabled.");
         }
 
@@ -261 +261 @@
                 ret = hc_driver->start(hcd);
         if (ret != EOK) {
-                usb_log_error("Failed to start HCD: %s.\n", str_error(ret));
+                usb_log_error("Failed to start HCD: %s.", str_error(ret));
                 goto err_irq;
         }
@@ -271 +271 @@
                 hcd->polling_fibril = fibril_create(interrupt_polling, hcd->bus);
                 if (!hcd->polling_fibril) {
-                        usb_log_error("Failed to create polling fibril\n");
+                        usb_log_error("Failed to create polling fibril");
                         ret = ENOMEM;
                         goto err_started;
@@ -277 +277 @@
                 fibril_add_ready(hcd->polling_fibril);
                 usb_log_warning("Failed to enable interrupts: %s."
-                    " Falling back to polling.\n", str_error(hcd->irq_cap));
+                    " Falling back to polling.", str_error(hcd->irq_cap));
         }
 
@@ -287 +287 @@
                 ret = hc_driver->setup_root_hub(hcd);
         if (ret != EOK) {
-                usb_log_error("Failed to setup HC root hub: %s.\n",
+                usb_log_error("Failed to setup HC root hub: %s.",
                     str_error(ret));
                 goto err_polling;
         }
 
-        usb_log_info("Controlling new `%s' device `%s'.\n",
+        usb_log_info("Controlling new `%s' device `%s'.",
            hc_driver->name, ddf_dev_get_name(device));
         return EOK;