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

Timestamp:

2011-05-08T16:04:05Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

1989cdf

Parents:

68b614e (diff), 7b6f116 (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 development changes

File:

• uspace/drv/uhci-hcd/uhci.h (modified) (1 diff)

uspace/drv/uhci-hcd/uhci.h

@@ -38 +38 @@
 #include <ddf/driver.h>
 
-#include "hc.h"
-#include "root_hub.h"
-
-/** Structure representing both functions of UHCI hc, USB host controller
- * and USB root hub */
-typedef struct uhci {
-        /** Pointer to DDF represenation of UHCI host controller */
-        ddf_fun_t *hc_fun;
-        /** Pointer to DDF represenation of UHCI root hub */
-        ddf_fun_t *rh_fun;
-
-        /** Internal driver's represenation of UHCI host controller */
-        hc_t hc;
-        /** Internal driver's represenation of UHCI root hub */
-        rh_t rh;
-} uhci_t;
-
-int uhci_init(uhci_t *instance, ddf_dev_t *device);
+int device_setup_uhci(ddf_dev_t *device);
 #endif
 /**