Changeset 0c2d9bb in mainline for uspace/drv/bus/usb/ehci/main.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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 mainline changes

File:

• uspace/drv/bus/usb/ehci/main.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/main.c

@@ -77 +77 @@
         assert(device);
 
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
+        addr_range_t reg_range;
         int irq = 0;
 
-        int rc = get_my_registers(device, &reg_base, &reg_size, &irq);
+        int rc = get_my_registers(device, &reg_range, &irq);
         if (rc != EOK) {
                 usb_log_error("Failed to get memory addresses for %" PRIun
@@ -88 +87 @@
         }
 
-        usb_log_info("Memory mapped regs at 0x%" PRIxn " (size %zu), IRQ %d.\n",
-            reg_base, reg_size, irq);
+        usb_log_info("Memory mapped regs at %p (size %zu), IRQ %d.\n",
+            RNGABSPTR(reg_range), RNGSZ(reg_range), irq);
 
-        rc = disable_legacy(device, reg_base, reg_size);
+        rc = disable_legacy(device, &reg_range);
         if (rc != EOK) {
                 usb_log_error("Failed to disable legacy USB: %s.\n",