Changeset 0773396 in mainline for uspace/drv/bus/usb/uhci/res.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/uhci/res.c (modified) (3 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);
@@ -64 +62 @@
         hw_res_list_parsed_t hw_res;
         hw_res_list_parsed_init(&hw_res);
-        const int ret =  hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
         async_hangup(parent_sess);
         if (ret != EOK) {
@@ -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];