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

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-rhd

Files:

• main.c (modified) (4 diffs)
• port.c (modified) (4 diffs)

uspace/drv/uhci-rhd/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Vojtech Horky, Jan Vesely
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -84 +84 @@
                 return EINVAL;
 
-        usb_log_debug2("%s called device %d\n", __FUNCTION__, device->handle);
+        usb_log_debug2("uhci_rh_add_device(handle=%" PRIun ")\n",
+            device->handle);
 
         uintptr_t io_regs = 0;
@@ -101 +102 @@
         ret = hc_get_my_registers(device, &io_regs, &io_size);
         CHECK_RET_FREE_RH_RETURN(ret,
-            "Failed(%d) to get registers from HC: %s.\n", ret, str_error(ret));
-        usb_log_debug("I/O regs at %#x (size %zu).\n", io_regs, io_size);
+            "Failed to get registers from HC: %s.\n", str_error(ret));
+        usb_log_debug("I/O regs at %p (size %zuB).\n",
+            (void *) io_regs, io_size);
 
         rh = malloc(sizeof(uhci_root_hub_t));
@@ -115 +117 @@
 
         device->driver_data = rh;
-        usb_log_info("Controlling root hub '%s' (%llu).\n",
+        usb_log_info("Controlling root hub '%s' (%" PRIun ").\n",
             device->name, device->handle);
         return EOK;

uspace/drv/uhci-rhd/port.c

@@ -89 +89 @@
 {
         assert(port);
-        asprintf(&port->id_string, "Port (%p - %d)", port, number);
+        asprintf(&port->id_string, "Port (%p - %u)", port, number);
         if (port->id_string == NULL) {
                 return ENOMEM;
@@ -115 +115 @@
 
         fibril_add_ready(port->checker);
-        usb_log_debug("%s: Started polling fibril(%x).\n",
+        usb_log_debug("%s: Started polling fibril (%" PRIun ").\n",
             port->id_string, port->checker);
         return EOK;
@@ -267 +267 @@
         }
 
-        usb_log_info("New device at port %u, address %d (handle %llu).\n",
+        usb_log_info("New device at port %u, address %d (handle %" PRIun ").\n",
             port->number, dev_addr, port->attached_device);
         return EOK;
@@ -283 +283 @@
 int uhci_port_remove_device(uhci_port_t *port)
 {
-        usb_log_error("%s: Don't know how to remove device %llu.\n",
+        usb_log_error("%s: Don't know how to remove device %" PRIun ".\n",
             port->id_string, port->attached_device);
         return ENOTSUP;