Changes in uspace/drv/bus/usb/ehci/main.c [dcffe95:1dc4a5e] in mainline

File:

• uspace/drv/bus/usb/ehci/main.c (modified) (6 diffs)

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

@@ -42 +42 @@
 #include <usb/ddfiface.h>
 #include <usb/debug.h>
-#include <usb/host/hcd.h>
 
-#include "res.h"
+#include "pci.h"
+#include "ehci.h"
 
-#define NAME "ehci"
-
-static int ehci_dev_add(ddf_dev_t *device);
+static int ehci_add_device(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
 static driver_ops_t ehci_driver_ops = {
-        .dev_add = ehci_dev_add,
+        .add_device = ehci_add_device,
 };
 /*----------------------------------------------------------------------------*/
@@ -59 +57 @@
 };
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
+        .interfaces[USBHC_DEV_IFACE] = &ehci_hc_iface,
 };
 
@@ -68 +66 @@
  * @return Error code.
  */
-static int ehci_dev_add(ddf_dev_t *device)
+static int ehci_add_device(ddf_dev_t *device)
 {
         assert(device);
@@ -81 +79 @@
         int irq = 0;
 
-        int ret = get_my_registers(device, &reg_base, &reg_size, &irq);
+        int ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_RETURN(ret,
             "Failed to get memory addresses for %" PRIun ": %s.\n",
@@ -88 +86 @@
             reg_base, reg_size, irq);
 
-        ret = disable_legacy(device, reg_base, reg_size);
+        ret = pci_disable_legacy(device, reg_base, reg_size, irq);
         CHECK_RET_RETURN(ret,
             "Failed to disable legacy USB: %s.\n", str_error(ret));
@@ -97 +95 @@
                 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;