Changes in uspace/drv/bus/usb/ehci/res.c [7de1988c:d930980] in mainline

File:

• uspace/drv/bus/usb/ehci/res.c (modified) (4 diffs)

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

@@ -71 +71 @@
  *
  * @param[in] dev Device asking for the addresses.
- * @param[out] mem_regs_p Pointer to the register range.
+ * @param[out] mem_reg_address Base address of the memory range.
+ * @param[out] mem_reg_size Size of the memory range.
  * @param[out] irq_no IRQ assigned to the device.
  * @return Error code.
  */
 int get_my_registers(ddf_dev_t *dev,
-    addr_range_t *mem_regs_p, int *irq_no)
+    uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no)
 {
         assert(dev);
@@ -98 +99 @@
         }
 
-        if (mem_regs_p)
-                *mem_regs_p = hw_res.mem_ranges.ranges[0];
+        if (mem_reg_address)
+                *mem_reg_address = hw_res.mem_ranges.ranges[0].address;
+        if (mem_reg_size)
+                *mem_reg_size = hw_res.mem_ranges.ranges[0].size;
         if (irq_no)
                 *irq_no = hw_res.irqs.irqs[0];
@@ -264 +267 @@
 }
 
-int disable_legacy(ddf_dev_t *device, addr_range_t *reg_range)
+int disable_legacy(ddf_dev_t *device, uintptr_t reg_base, size_t reg_size)
 {
         assert(device);
@@ -271 +274 @@
         /* Map EHCI registers */
         void *regs = NULL;
-        int rc = pio_enable_range(reg_range, &regs);
+        int rc = pio_enable((void*)reg_base, reg_size, &regs);
         if (rc != EOK) {
                 usb_log_error("Failed to map registers %p: %s.\n",
-                    RNGABSPTR(*reg_range), str_error(rc));
+                    (void *) reg_base, str_error(rc));
                 return rc;
         }