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

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

@@ -141 +141 @@
         code->cmds[3].addr = (void*)&registers->usbsts;
 
-        usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n",
+        usb_log_debug("I/O regs at %p (size %zu), IRQ %d.",
             RNGABSPTR(regs), RNGSZ(regs), hw_res->irqs.irqs[0]);
 
@@ -182 +182 @@
         /* Resume interrupts are not supported */
         if (status & UHCI_STATUS_RESUME) {
-                usb_log_error("Resume interrupt!\n");
+                usb_log_error("Resume interrupt!");
         }
 
         /* Bits 4 and 5 indicate hc error */
         if (status & (UHCI_STATUS_PROCESS_ERROR | UHCI_STATUS_SYSTEM_ERROR)) {
-                usb_log_error("UHCI hardware failure!.\n");
+                usb_log_error("UHCI hardware failure!.");
                 ++instance->hw_failures;
                 transfer_list_abort_all(&instance->transfers_interrupt);
@@ -198 +198 @@
                         hc_init_hw(instance);
                 } else {
-                        usb_log_fatal("Too many UHCI hardware failures!.\n");
+                        usb_log_fatal("Too many UHCI hardware failures!.");
                         hc_gone(&instance->base);
                 }
@@ -229 +229 @@
             (void **) &instance->registers);
         if (ret != EOK) {
-                usb_log_error("Failed to gain access to registers: %s.\n",
+                usb_log_error("Failed to gain access to registers: %s.",
                     str_error(ret));
                 return ret;
         }
 
-        usb_log_debug("Device registers at %" PRIx64 " (%zuB) accessible.\n",
+        usb_log_debug("Device registers at %" PRIx64 " (%zuB) accessible.",
             hw_res->io_ranges.ranges[0].address.absolute,
             hw_res->io_ranges.ranges[0].size);
@@ -240 +240 @@
         ret = hc_init_mem_structures(instance, hcd);
         if (ret != EOK) {
-                usb_log_error("Failed to init UHCI memory structures: %s.\n",
+                usb_log_error("Failed to init UHCI memory structures: %s.",
                     str_error(ret));
                 // TODO: we should disable pio here
@@ -304 +304 @@
         const uint16_t cmd = pio_read_16(&registers->usbcmd);
         if (cmd != 0)
-                usb_log_warning("Previous command value: %x.\n", cmd);
+                usb_log_warning("Previous command value: %x.", cmd);
 
         /* Start the hc with large(64B) packet FSBR */
@@ -399 +399 @@
                 return ENOMEM;
         }
-        usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
+        usb_log_debug("Initialized frame list at %p.", instance->frame_list);
 
         /* Init transfer lists */
         int ret = hc_init_transfer_lists(instance);
         if (ret != EOK) {
-                usb_log_error("Failed to initialize transfer lists.\n");
+                usb_log_error("Failed to initialize transfer lists.");
                 return_page(instance->frame_list);
                 return ENOMEM;
         }
-        usb_log_debug("Initialized transfer lists.\n");
+        usb_log_debug("Initialized transfer lists.");
 
 
@@ -438 +438 @@
         int ret = transfer_list_init(&instance->transfers_##type, name); \
         if (ret != EOK) { \
-                usb_log_error("Failed to setup %s transfer list: %s.\n", \
+                usb_log_error("Failed to setup %s transfer list: %s.", \
                     name, str_error(ret)); \
                 transfer_list_fini(&instance->transfers_bulk_full); \
@@ -552 +552 @@
 
                 if (((cmd & UHCI_CMD_RUN_STOP) != 1) || (sts != 0)) {
-                        usb_log_debug2("Command: %X Status: %X Intr: %x\n",
+                        usb_log_debug2("Command: %X Status: %X Intr: %x",
                             cmd, sts, intr);
                 }
@@ -559 +559 @@
                     pio_read_32(&instance->registers->flbaseadd) & ~0xfff;
                 if (frame_list != addr_to_phys(instance->frame_list)) {
-                        usb_log_debug("Framelist address: %p vs. %p.\n",
+                        usb_log_debug("Framelist address: %p vs. %p.",
                             (void *) frame_list,
                             (void *) addr_to_phys(instance->frame_list));
@@ -570 +570 @@
                 uintptr_t real_pa = addr_to_phys(QH(interrupt));
                 if (expected_pa != real_pa) {
-                        usb_log_debug("Interrupt QH: %p (frame %d) vs. %p.\n",
+                        usb_log_debug("Interrupt QH: %p (frame %d) vs. %p.",
                             (void *) expected_pa, frnum, (void *) real_pa);
                 }
@@ -577 +577 @@
                 real_pa = addr_to_phys(QH(control_slow));
                 if (expected_pa != real_pa) {
-                        usb_log_debug("Control Slow QH: %p vs. %p.\n",
+                        usb_log_debug("Control Slow QH: %p vs. %p.",
                             (void *) expected_pa, (void *) real_pa);
                 }
@@ -584 +584 @@
                 real_pa = addr_to_phys(QH(control_full));
                 if (expected_pa != real_pa) {
-                        usb_log_debug("Control Full QH: %p vs. %p.\n",
+                        usb_log_debug("Control Full QH: %p vs. %p.",
                             (void *) expected_pa, (void *) real_pa);
                 }
@@ -591 +591 @@
                 real_pa = addr_to_phys(QH(bulk_full));
                 if (expected_pa != real_pa ) {
-                        usb_log_debug("Bulk QH: %p vs. %p.\n",
+                        usb_log_debug("Bulk QH: %p vs. %p.",
                             (void *) expected_pa, (void *) real_pa);
                 }