Changeset 0773396 in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/ohci/ohci.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/ohci.c

@@ -177 +177 @@
         ddf_fun_set_ops(instance->rh_fun, &rh_ops);
 
-        uintptr_t reg_base = 0;
-        size_t reg_size = 0;
+        addr_range_t regs;
         int irq = 0;
 
-        rc = get_my_registers(device, &reg_base, &reg_size, &irq);
+        rc = get_my_registers(device, &regs, &irq);
         if (rc != EOK) {
                 usb_log_error("Failed to get register memory addresses "
@@ -190 +189 @@
 
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
-            (void *) reg_base, reg_size, irq);
-
-        rc = hc_register_irq_handler(device, reg_base, reg_size, irq, irq_handler);
+            RNGABSPTR(regs), RNGSZ(regs), irq);
+
+        rc = hc_register_irq_handler(device, &regs, irq, irq_handler);
         if (rc != EOK) {
                 usb_log_error("Failed to register interrupt handler: %s.\n",
@@ -215 +214 @@
         }
 
-        rc = hc_init(&instance->hc, reg_base, reg_size, interrupts);
+        rc = hc_init(&instance->hc, &regs, interrupts);
         if (rc != EOK) {
                 usb_log_error("Failed to init ohci_hcd: %s.\n", str_error(rc));