Changeset 4125b7d in mainline for uspace/drv/uhci-hcd

Timestamp:

2011-04-18T20:06:55Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

84a04dd, bbdf09e

Parents:

5ab4a48

Message:

usb_log_printf() checks for printf correctness

It is surprising how many printf warnings simple check could
produce .

Next time, it won't compile. Bad, huh?

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (2 diffs)
• hc.c (modified) (6 diffs)
• hw_struct/transfer_descriptor.c (modified) (1 diff)
• iface.c (modified) (1 diff)
• main.c (modified) (1 diff)
• pci.c (modified) (1 diff)
• transfer_list.c (modified) (1 diff)
• uhci.c (modified) (1 diff)

uspace/drv/uhci-hcd/batch.c

@@ -162 +162 @@
         assert(data);
 
-        usb_log_debug2("Batch(%p) checking %d transfer(s) for completion.\n",
+        usb_log_debug2("Batch(%p) checking %zu transfer(s) for completion.\n",
             instance, data->td_count);
         instance->transfered_size = 0;
@@ -173 +173 @@
                 instance->error = td_status(&data->tds[i]);
                 if (instance->error != EOK) {
-                        usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
+                        usb_log_debug("Batch(%p) found error TD(%zu):%" PRIx32 ".\n",
                             instance, i, data->tds[i].status);
                         td_print_status(&data->tds[i]);

uspace/drv/uhci-hcd/hc.c

@@ -101 +101 @@
             ret, io, str_error(ret));
         instance->registers = io;
-        usb_log_debug("Device registers at %p(%u) accessible.\n",
+        usb_log_debug("Device registers at %p (%zuB) accessible.\n",
             io, reg_size);
 
@@ -423 +423 @@
                 if (frame_list != addr_to_phys(instance->frame_list)) {
                         usb_log_debug("Framelist address: %p vs. %p.\n",
-                            frame_list, addr_to_phys(instance->frame_list));
+                            (void *) frame_list,
+                            (void *) addr_to_phys(instance->frame_list));
                 }
 
@@ -432 +433 @@
                 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",
-                            expected_pa, frnum, real_pa);
+                        usb_log_debug("Interrupt QH: %p (frame %d) vs. %p.\n",
+                            (void *) expected_pa, frnum, (void *) real_pa);
                 }
 
@@ -440 +441 @@
                 if (expected_pa != real_pa) {
                         usb_log_debug("Control Slow QH: %p vs. %p.\n",
-                            expected_pa, real_pa);
+                            (void *) expected_pa, (void *) real_pa);
                 }
 
@@ -447 +448 @@
                 if (expected_pa != real_pa) {
                         usb_log_debug("Control Full QH: %p vs. %p.\n",
-                            expected_pa, real_pa);
+                            (void *) expected_pa, (void *) real_pa);
                 }
 
@@ -454 +455 @@
                 if (expected_pa != real_pa ) {
                         usb_log_debug("Bulk QH: %p vs. %p.\n",
-                            expected_pa, real_pa);
+                            (void *) expected_pa, (void *) real_pa);
                 }
                 async_usleep(UHCI_DEBUGER_TIMEOUT);

uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.c

@@ -154 +154 @@
         assert(instance);
         const uint32_t s = instance->status;
-        usb_log_debug2("TD(%p) status(%#x):%s %d,%s%s%s%s%s%s%s%s%s%s%s %d.\n",
+        usb_log_debug2("TD(%p) status(%#" PRIx32 "):%s %d,%s%s%s%s%s%s%s%s%s%s%s %zu.\n",
             instance, instance->status,
             (s & TD_STATUS_SPD_FLAG) ? " SPD," : "",

uspace/drv/uhci-hcd/iface.c

@@ -118 +118 @@
         hc_t *hc = fun_to_hc(fun);
         assert(hc);
-        usb_log_debug("Address bind %d-%d.\n", address, handle);
+        usb_log_debug("Address bind %d-%" PRIun ".\n", address, handle);
         usb_device_keeper_bind(&hc->manager, address, handle);
         return EOK;

uspace/drv/uhci-hcd/main.c

@@ -72 +72 @@
         int ret = uhci_init(uhci, device);
         if (ret != EOK) {
-                usb_log_error("Failed(%d) to initialize UHCI driver: %s.\n",
-                    ret, str_error(ret));
+                usb_log_error("Failed to initialize UHCI driver: %s.\n",
+                    str_error(ret));
                 return ret;
         }

uspace/drv/uhci-hcd/pci.c

@@ -90 +90 @@
                         io_address = res->res.io_range.address;
                         io_size = res->res.io_range.size;
-                        usb_log_debug2("Found io: %llx %zu.\n",
+                        usb_log_debug2("Found io: %" PRIx64" %zu.\n",
                             res->res.io_range.address, res->res.io_range.size);
                         io_found = true;

uspace/drv/uhci-hcd/transfer_list.c

@@ -58 +58 @@
         }
         uint32_t queue_head_pa = addr_to_phys(instance->queue_head);
-        usb_log_debug2("Transfer list %s setup with QH: %p(%p).\n",
+        usb_log_debug2("Transfer list %s setup with QH: %p (%#" PRIx32" ).\n",
             name, instance->queue_head, queue_head_pa);
 

uspace/drv/uhci-hcd/uhci.c

@@ -168 +168 @@
             pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq);
         CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to get I/O addresses:.\n", ret, device->handle);
-        usb_log_debug("I/O regs at 0x%X (size %zu), IRQ %d.\n",
-            io_reg_base, io_reg_size, irq);
+            "Failed to get I/O addresses for %" PRIun ": %s.\n",
+            device->handle, str_error(ret));
+        usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
+            (void *) io_reg_base, io_reg_size, irq);
 
         ret = pci_disable_legacy(device);