Changeset e6b9182 in mainline for uspace/drv/bus/usb/ohci/main.c

Timestamp:

2017-10-13T08:49:29Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

741bcdeb

Parents:

0a5833d7

Message:

WIP usbhost refactoring: ohci completed

Along with that we noticed hcd_t in bus_t is superfluous and it complicates initialization (and breaks isolation), so we removed it. Also, type of the toggle has changed to bool in the functions.

File:

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

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

@@ -45 +45 @@
 
 #include "hc.h"
+#include "ohci_bus.h"
 
 #define NAME "ohci"
@@ -53 +54 @@
 
 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,
@@ -62 +62 @@
         .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,
@@ -72 +70 @@
 static int ohci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res)
 {
+        int err;
+
         assert(hcd);
         assert(hcd_get_driver_data(hcd) == NULL);
@@ -79 +79 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res);
-        if (ret == EOK) {
-                hcd_set_implementation(hcd, instance, &ohci_hc_driver.ops);
-        } else {
-                free(instance);
-        }
-        return ret;
+        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;
 }
 
@@ -115 +121 @@
                 hc_fini(hc);
 
-        hcd_set_implementation(hcd, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL, NULL);
         free(hc);
 }