Changeset 4125b7d in mainline for uspace/drv/ohci

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/ohci

Files:

• batch.c (modified) (3 diffs)
• endpoint_list.c (modified) (2 diffs)
• hc.c (modified) (5 diffs)
• iface.c (modified) (1 diff)
• ohci.c (modified) (1 diff)
• pci.c (modified) (1 diff)

uspace/drv/ohci/batch.c

@@ -141 +141 @@
         assert(data);
         size_t tds = data->td_count;
-        usb_log_debug("Batch(%p) checking %d td(s) for completion.\n",
+        usb_log_debug("Batch(%p) checking %zu td(s) for completion.\n",
             instance, tds);
         usb_log_debug("ED: %x:%x:%x:%x.\n",
@@ -150 +150 @@
         for (; i < tds; ++i) {
                 assert(data->tds[i] != NULL);
-                usb_log_debug("TD %d: %x:%x:%x:%x.\n", i,
+                usb_log_debug("TD %zu: %x:%x:%x:%x.\n", i,
                     data->tds[i]->status, data->tds[i]->cbp, data->tds[i]->next,
                     data->tds[i]->be);
@@ -158 +158 @@
                 instance->error = td_error(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):%x.\n",
                             instance, i, data->tds[i]->status);
                         /* Make sure TD queue is empty (one TD),

uspace/drv/ohci/endpoint_list.c

@@ -55 +55 @@
         }
         instance->list_head_pa = addr_to_phys(instance->list_head);
-        usb_log_debug2("Transfer list %s setup with ED: %p(%p).\n",
+        usb_log_debug2("Transfer list %s setup with ED: %p(0x%0" PRIx32 ")).\n",
             name, instance->list_head, instance->list_head_pa);
 
@@ -121 +121 @@
                 hcd_ep, instance->name, first, first->ed);
         if (last_ed == instance->list_head) {
-                usb_log_debug2("%s head ED(%p-%p): %x:%x:%x:%x.\n",
+                usb_log_debug2("%s head ED(%p-0x%0" PRIx32 "): %x:%x:%x:%x.\n",
                     instance->name, last_ed, instance->list_head_pa,
                     last_ed->status, last_ed->td_tail, last_ed->td_head,

uspace/drv/ohci/hc.c

@@ -113 +113 @@
             BANDWIDTH_AVAILABLE_USB11);
         CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
-            ret, str_error(ret));
+            str_error(ret));
 
         hc_gain_control(instance);
         ret = hc_init_memory(instance);
-        CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures:%s.\n",
-            ret, str_error(ret));
+        CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
+            str_error(ret));
         hc_init_hw(instance);
         fibril_mutex_initialize(&instance->guard);
@@ -294 +294 @@
         if (status & IS_WDH) {
                 fibril_mutex_lock(&instance->guard);
-                usb_log_debug2("HCCA: %p-%p(%p).\n", instance->hcca,
-                    instance->registers->hcca, addr_to_phys(instance->hcca));
-                usb_log_debug2("Periodic current: %p.\n",
+                usb_log_debug2("HCCA: %p-%#" PRIx32 " (%p).\n", instance->hcca,
+                    instance->registers->hcca,
+                    (void *) addr_to_phys(instance->hcca));
+                usb_log_debug2("Periodic current: %#" PRIx32 ".\n",
                     instance->registers->periodic_current);
 
@@ -405 +406 @@
         instance->registers->bulk_head =
             instance->lists[USB_TRANSFER_BULK].list_head_pa;
-        usb_log_debug2("Bulk HEAD set to: %p(%p).\n",
+        usb_log_debug2("Bulk HEAD set to: %p (%#" PRIx32 ").\n",
             instance->lists[USB_TRANSFER_BULK].list_head,
             instance->lists[USB_TRANSFER_BULK].list_head_pa);
@@ -411 +412 @@
         instance->registers->control_head =
             instance->lists[USB_TRANSFER_CONTROL].list_head_pa;
-        usb_log_debug2("Control HEAD set to: %p(%p).\n",
+        usb_log_debug2("Control HEAD set to: %p (%#" PRIx32 ").\n",
             instance->lists[USB_TRANSFER_CONTROL].list_head,
             instance->lists[USB_TRANSFER_CONTROL].list_head_pa);
@@ -487 +488 @@
                     instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa;
         }
-        usb_log_debug2("Interrupt HEADs set to: %p(%p).\n",
+        usb_log_debug2("Interrupt HEADs set to: %p (%#" PRIx32 ").\n",
             instance->lists[USB_TRANSFER_INTERRUPT].list_head,
             instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa);

uspace/drv/ohci/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/ohci/ohci.c

@@ -148 +148 @@
             pci_get_my_registers(device, &mem_reg_base, &mem_reg_size, &irq);
         CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to get memory addresses:.\n", ret, device->handle);
-        usb_log_debug("Memory mapped regs at 0x%X (size %zu), IRQ %d.\n",
-            mem_reg_base, mem_reg_size, irq);
+            "Failed to get memory addresses for %" PRIun ": %s.\n",
+            device->handle, str_error(ret));
+        usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
+            (void *) mem_reg_base, mem_reg_size, irq);
 
         ret = pci_disable_legacy(device);

uspace/drv/ohci/pci.c

@@ -117 +117 @@
                                 mem_address = res->res.mem_range.address;
                                 mem_size = res->res.mem_range.size;
-                                usb_log_debug2("Found mem: %llx %zu.\n",
-                                    mem_address, mem_size);
+                                usb_log_debug2("Found mem: %p %zu.\n",
+                                    (void *) mem_address, mem_size);
                                 mem_found = true;
                                 }