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

Timestamp:

2011-05-30T20:02:17Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

c3dafe1

Parents:

be8d907 (diff), 63862a0 (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 with usb/development

File:

• uspace/drv/ehci-hcd/main.c (modified) (1 diff)

uspace/drv/ehci-hcd/main.c

@@ -75 +75 @@
 }
 
-        uintptr_t mem_reg_base = 0;
-        size_t mem_reg_size = 0;
+        uintptr_t reg_base = 0;
+        size_t reg_size = 0;
         int irq = 0;
 
-        int ret =
-            pci_get_my_registers(device, &mem_reg_base, &mem_reg_size, &irq);
+        int ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_RETURN(ret,
             "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);
+            reg_base, reg_size, irq);
 
-        ret = pci_disable_legacy(device);
+        ret = pci_disable_legacy(device, reg_base, reg_size, irq);
         CHECK_RET_RETURN(ret,
             "Failed(%d) disable legacy USB: %s.\n", ret, str_error(ret));