Changeset 5828554 in mainline for uspace/drv/bus/usb/uhci/root_hub.h

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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.h (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <ddf/driver.h>
 #include <ops/hw_res.h>
+#include <ops/pio_window.h>
 
 /** DDF support structure for uhci_rhd driver, provides I/O resources */
@@ -45 +46 @@
         /** The only resource in the RH resource list */
         hw_resource_t io_regs;
+        /** PIO window in which the RH will operate. */
+        pio_window_t pio_window;        
 } rh_t;
 
-int rh_init(
-    rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size);
+extern int rh_init(rh_t *, ddf_fun_t *, addr_range_t *, uintptr_t, size_t);
 
 #endif