Changeset 0c2d9bb in mainline for uspace/drv/bus/usb/uhci/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/uhci/root_hub.c (modified) (3 diffs)

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

@@ -36 +36 @@
 #include <str_error.h>
 #include <stdio.h>
+#include <device/hw_res_parsed.h>
 
 #include <usb/debug.h>
@@ -48 +49 @@
  * @return Error code.
  */
-int rh_init(rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size)
+int
+rh_init(rh_t *instance, ddf_fun_t *fun, addr_range_t *regs, uintptr_t reg_addr,
+    size_t reg_size)
 {
         assert(instance);
         assert(fun);
+
+        /* Crop the PIO window to the absolute address range of UHCI I/O. */
+        instance->pio_window.mem.base = 0;
+        instance->pio_window.mem.size = 0;
+        instance->pio_window.io.base = RNGABS(*regs);
+        instance->pio_window.io.size = RNGSZ(*regs);
 
         /* Initialize resource structure */
@@ -60 +69 @@
         instance->io_regs.res.io_range.address = reg_addr;
         instance->io_regs.res.io_range.size = reg_size;
+        instance->io_regs.res.io_range.relative = true;
         instance->io_regs.res.io_range.endianness = LITTLE_ENDIAN;