Changeset 7aaed09 in mainline for uspace/drv/bus/usb/ehci/main.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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/ehci/main.c (modified) (4 diffs)

uspace/drv/bus/usb/ehci/main.c

@@ -42 +42 @@
 #include <usb/ddfiface.h>
 #include <usb/debug.h>
+#include <usb/host/hcd.h>
 
 #include "pci.h"
-#include "ehci.h"
 
-static int ehci_add_device(ddf_dev_t *device);
+#define NAME "ehci"
+
+static int ehci_dev_add(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
 static driver_ops_t ehci_driver_ops = {
-        .add_device = ehci_add_device,
+        .dev_add = ehci_dev_add,
 };
 /*----------------------------------------------------------------------------*/
@@ -57 +59 @@
 };
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &ehci_hc_iface,
+        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
 };
 
@@ -66 +68 @@
  * @return Error code.
  */
-static int ehci_add_device(ddf_dev_t *device)
+static int ehci_dev_add(ddf_dev_t *device)
 {
         assert(device);
@@ -95 +97 @@
                 return ENOMEM;
         }
+        hcd_t *ehci_hc = ddf_fun_data_alloc(hc_fun, sizeof(hcd_t));
+        if (ehci_hc == NULL) {
+                usb_log_error("Failed to alloc generic HC driver.\n");
+                return ENOMEM;
+        }
+        /* High Speed, no bandwidth */
+        hcd_init(ehci_hc, USB_SPEED_HIGH, 0, NULL);
         hc_fun->ops = &hc_ops;