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

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

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

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

@@ -33 +33 @@
  * Main routines of OHCI driver.
  */
+
+#include <assert.h>
 #include <ddf/driver.h>
 #include <errno.h>
+#include <io/log.h>
 #include <str_error.h>
 
 #include <usb/debug.h>
+#include <usb/host/ddf_helpers.h>
 
-#include "ohci.h"
+#include "hc.h"
 
 #define NAME "ohci"
+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,
+        .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,
+        },
+};
+
+
+static int ohci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
+{
+        assert(hcd);
+        assert(hcd_get_driver_data(hcd) == NULL);
+
+        hc_t *instance = malloc(sizeof(hc_t));
+        if (!instance)
+                return ENOMEM;
+
+        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;
+}
+
+static void ohci_driver_fini(hcd_t *hcd)
+{
+        assert(hcd);
+        hc_t *hc = hcd_get_driver_data(hcd);
+        if (hc)
+                hc_fini(hc);
+
+        hcd_set_implementation(hcd, NULL, NULL);
+        free(hc);
+}
 
 /** Initializes a new ddf driver instance of OHCI hcd.
@@ -52 +103 @@
         usb_log_debug("ohci_dev_add() called\n");
         assert(device);
-
-        int ret = device_setup_ohci(device);
-        if (ret != EOK) {
-                usb_log_error("Failed to initialize OHCI driver: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
-        usb_log_info("Controlling new OHCI device '%s'.\n", ddf_dev_get_name(device));
-
-        return EOK;
+        return hcd_ddf_add_hc(device, &ohci_hc_driver);
 }
 
-static driver_ops_t ohci_driver_ops = {
+static const driver_ops_t ohci_driver_ops = {
         .dev_add = ohci_dev_add,
 };
 
-static driver_t ohci_driver = {
+static const driver_t ohci_driver = {
         .name = NAME,
         .driver_ops = &ohci_driver_ops