Changes in uspace/drv/bus/usb/ohci/main.c [366e9b6:58563585] in mainline

File:

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

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

@@ -45 +45 @@
 
 #include "hc.h"
-#include "ohci_bus.h"
 
 #define NAME "ohci"
-static int ohci_driver_init(hcd_t *, const hw_res_list_parsed_t *);
-static int ohci_driver_start(hcd_t *, bool);
-static int ohci_driver_claim(hcd_t *, ddf_dev_t *);
+static int ohci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
 static void ohci_driver_fini(hcd_t *);
 
 static const ddf_hc_driver_t ohci_hc_driver = {
+        .hc_speed = USB_SPEED_FULL,
         .irq_code_gen = ohci_hc_gen_irq_code,
         .init = ohci_driver_init,
-        .claim = ohci_driver_claim,
-        .start = ohci_driver_start,
-        .setup_root_hub = hcd_setup_virtual_root_hub,
         .fini = ohci_driver_fini,
         .name = "OHCI",
         .ops = {
                 .schedule       = ohci_hc_schedule,
+                .ep_add_hook    = ohci_endpoint_init,
+                .ep_remove_hook = ohci_endpoint_fini,
                 .irq_hook       = ohci_hc_interrupt,
                 .status_hook    = ohci_hc_status,
@@ -69 +66 @@
 
 
-static int ohci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res)
+static int ohci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
 {
-        int err;
-
         assert(hcd);
         assert(hcd_get_driver_data(hcd) == NULL);
@@ -80 +75 @@
                 return ENOMEM;
 
-        if ((err = hc_init(instance, res)) != EOK)
-                goto err;
-
-        if ((err = ohci_bus_init(&instance->bus, instance)))
-                goto err;
-
-        hcd_set_implementation(hcd, instance, &ohci_hc_driver.ops, &instance->bus.base.base);
-
-        return EOK;
-
-err:
-        free(instance);
-        return err;
-}
-
-static int ohci_driver_claim(hcd_t *hcd, ddf_dev_t *dev)
-{
-        hc_t *hc = hcd_get_driver_data(hcd);
-        assert(hc);
-
-        hc_gain_control(hc);
-
-        return EOK;
-}
-
-static int ohci_driver_start(hcd_t *hcd, bool interrupts)
-{
-        hc_t *hc = hcd_get_driver_data(hcd);
-        assert(hc);
-
-        hc->hw_interrupts = interrupts;
-        hc_start(hc);
-        return EOK;
+        const int ret = hc_init(instance, res, irq);
+        if (ret == EOK) {
+                hcd_set_implementation(hcd, instance, &ohci_hc_driver.ops);
+        } else {
+                free(instance);
+        }
+        return ret;
 }
 
@@ -122 +91 @@
                 hc_fini(hc);
 
-        hcd_set_implementation(hcd, NULL, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL);
         free(hc);
 }