Changeset e1dbcbc in mainline for uspace/drv/ehci-hcd/main.c

Timestamp:

2011-04-29T13:43:01Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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 development/ changes

File:

• uspace/drv/ehci-hcd/main.c (modified) (2 diffs)

uspace/drv/ehci-hcd/main.c

@@ -82 +82 @@
             pci_get_my_registers(device, &mem_reg_base, &mem_reg_size, &irq);
         CHECK_RET_RETURN(ret,
-            "Failed(%d) to get memory addresses:.\n", ret, device->handle);
-        usb_log_info("Memory mapped regs at 0x%X (size %zu), IRQ %d.\n",
+            "Failed to get memory addresses for %" PRIun ": %s.\n",
+            device->handle, str_error(ret));
+        usb_log_info("Memory mapped regs at 0x%" PRIxn " (size %zu), IRQ %d.\n",
             mem_reg_base, mem_reg_size, irq);
 
@@ -102 +103 @@
             str_error(ret));
 
-        usb_log_info("Controlling new EHCI device `%s' (handle %llu).\n",
+        usb_log_info("Controlling new EHCI device `%s' (handle %" PRIun ").\n",
             device->name, device->handle);