Changeset 44b1674 in mainline for uspace/drv/uhci-rhd/port.c

Timestamp:

2011-04-18T21:48:55Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

9014dcd

Parents:

618f9ed (diff), 84a04dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge form usb/development

File:

• uspace/drv/uhci-rhd/port.c (modified) (4 diffs)

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;