Changeset 62f4212 in mainline for uspace/drv/uhci-hcd/root_hub.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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:

Merged changes from development

File:

• uspace/drv/uhci-hcd/root_hub.c (moved) (moved from uspace/drv/uhci-hcd/uhci_rh.c ) (2 diffs)

uspace/drv/uhci-hcd/root_hub.c

@@ -39 +39 @@
 #include <usb/debug.h>
 
-#include "uhci_rh.h"
-#include "uhci_hc.h"
+#include "root_hub.h"
 
 /** Root hub initialization
@@ -49 +48 @@
  * @return Error code.
  */
-int uhci_rh_init(
-    uhci_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, uintptr_t reg_addr, size_t reg_size)
 {
         assert(fun);