Changeset 0c2d9bb in mainline for uspace/drv/bus/usb/uhcirh/root_hub.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/uhcirh/root_hub.c (modified) (2 diffs)

uspace/drv/bus/usb/uhcirh/root_hub.c

@@ -36 +36 @@
 #include <ddi.h>
 #include <usb/debug.h>
+#include <device/hw_res_parsed.h>
 
 #include "root_hub.h"
@@ -42 +43 @@
  *
  * @param[in] instance Driver memory structure to use.
- * @param[in] addr Address of I/O registers.
- * @param[in] size Size of available I/O space.
+ * @param[in] io_regs Range of I/O registers.
  * @param[in] rh Pointer to DDF instance of the root hub driver.
  * @return Error code.
  */
-int uhci_root_hub_init(
-  uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh)
+int uhci_root_hub_init(uhci_root_hub_t *instance, addr_range_t *io_regs,
+    ddf_dev_t *rh)
 {
+        port_status_t *regs;
+
         assert(instance);
         assert(rh);
 
         /* Allow access to root hub port registers */
-        assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT <= size);
-        port_status_t *regs;
-        int ret = pio_enable(addr, size, (void**)&regs);
+        assert(sizeof(*regs) * UHCI_ROOT_HUB_PORT_COUNT <= io_regs->size);
+
+        int ret = pio_enable_range(io_regs, (void **) &regs);
         if (ret < 0) {
                 usb_log_error(
                     "Failed(%d) to gain access to port registers at %p: %s.\n",
-                    ret, regs, str_error(ret));
+                    ret, RNGABSPTR(*io_regs), str_error(ret));
                 return ret;
         }