Changeset 44b1674 in mainline for uspace/drv/uhci-rhd/main.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/main.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;