Changes in uspace/drv/bus/usb/ehci/main.c [20eaa82:58563585] in mainline

File:

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

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

@@ -48 +48 @@
 #include "res.h"
 #include "hc.h"
+#include "ehci_endpoint.h"
 
 #define NAME "ehci"
 
-static int ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *);
-static int ehci_driver_claim(hcd_t *, ddf_dev_t *);
-static int ehci_driver_start(hcd_t *, bool);
+static int ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
 static void ehci_driver_fini(hcd_t *);
 
 static const ddf_hc_driver_t ehci_hc_driver = {
+        .claim = disable_legacy,
+        .hc_speed = USB_SPEED_HIGH,
+        .irq_code_gen = ehci_hc_gen_irq_code,
+        .init = ehci_driver_init,
+        .fini = ehci_driver_fini,
         .name = "EHCI-PCI",
-        .init = ehci_driver_init,
-        .irq_code_gen = ehci_hc_gen_irq_code,
-        .claim = ehci_driver_claim,
-        .start = ehci_driver_start,
-        .setup_root_hub = hcd_setup_virtual_root_hub,
-        .fini = ehci_driver_fini,
         .ops = {
                 .schedule       = ehci_hc_schedule,
+                .ep_add_hook    = ehci_endpoint_init,
+                .ep_remove_hook = ehci_endpoint_fini,
                 .irq_hook       = ehci_hc_interrupt,
                 .status_hook    = ehci_hc_status,
@@ -72 +72 @@
 
 
-static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res)
+static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res,
+    bool irq)
 {
         assert(hcd);
@@ -81 +82 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res);
+        const int ret = hc_init(instance, res, irq);
         if (ret == EOK) {
-                hcd_set_implementation(hcd, instance, &ehci_hc_driver.ops, &instance->bus.base.base);
+                hcd_set_implementation(hcd, instance, &ehci_hc_driver.ops);
         } else {
                 free(instance);
         }
         return ret;
-}
-
-static int ehci_driver_claim(hcd_t *hcd, ddf_dev_t *dev)
-{
-        hc_t *instance = hcd_get_driver_data(hcd);
-        assert(instance);
-
-        return disable_legacy(instance, dev);
-}
-
-static int ehci_driver_start(hcd_t *hcd, bool irq) {
-        hc_t *instance = hcd_get_driver_data(hcd);
-        assert(instance);
-
-        return hc_start(instance, irq);
 }
 
@@ -113 +99 @@
 
         free(hc);
-        hcd_set_implementation(hcd, NULL, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL);
 }