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

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/uhci.h (modified) (2 diffs)

uspace/drv/uhci-hcd/uhci.h

@@ -38 +38 @@
 #include <ddf/driver.h>
 
-#include "uhci_hc.h"
-#include "uhci_rh.h"
+#include "hc.h"
+#include "root_hub.h"
 
 typedef struct uhci {
@@ -45 +45 @@
         ddf_fun_t *rh_fun;
 
-        uhci_hc_t hc;
-        uhci_rh_t rh;
+        hc_t hc;
+        rh_t rh;
 } uhci_t;