Changeset b5ba8f6 in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2013-09-13T13:11:53Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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/uhci/uhci.c (modified) (4 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -184 +184 @@
         ddf_fun_data_implant(instance->rh_fun, &instance->rh);
 
-        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 I/O addresses for %" PRIun ": %s.\n",
@@ -194 +193 @@
                 goto error;
         }
-        usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
-            (void *) reg_base, reg_size, irq);
+        usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n",
+            RNGABSPTR(regs), RNGSZ(regs), irq);
 
         rc = disable_legacy(device);
@@ -204 +203 @@
         }
 
-        rc = hc_register_irq_handler(device, reg_base, reg_size, irq, irq_handler);
+        rc = hc_register_irq_handler(device, &regs, irq, irq_handler);
         if (rc != EOK) {
                 usb_log_error("Failed to register interrupt handler: %s.\n",
@@ -223 +222 @@
         }
 
-        rc = hc_init(&instance->hc, (void*)reg_base, reg_size, interrupts);
+        rc = hc_init(&instance->hc, &regs, interrupts);
         if (rc != EOK) {
                 usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(rc));