Changeset b5ba8f6 in mainline for uspace/drv/bus/usb/uhci/res.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/res.c (modified) (2 diffs)

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

@@ -46 +46 @@
  *
  * @param[in] dev Device asking for the addresses.
- * @param[out] io_reg_address Base address of the I/O range.
- * @param[out] io_reg_size Size of the I/O range.
+ * @param[out] io_regs_p Pointer to register I/O range.
  * @param[out] irq_no IRQ assigned to the device.
  * @return Error code.
  */
-int get_my_registers(ddf_dev_t *dev,
-    uintptr_t *io_reg_address, size_t *io_reg_size, int *irq_no)
+int get_my_registers(ddf_dev_t *dev, addr_range_t *io_regs_p, int *irq_no)
 {
         assert(dev);
@@ -76 +74 @@
         }
 
-        if (io_reg_address)
-                *io_reg_address = hw_res.io_ranges.ranges[0].address;
-        if (io_reg_size)
-                *io_reg_size = hw_res.io_ranges.ranges[0].size;
+        if (io_regs_p)
+                *io_regs_p = hw_res.io_ranges.ranges[0];
         if (irq_no)
                 *irq_no = hw_res.irqs.irqs[0];