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

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

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

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

@@ -2 +2 @@
  * Copyright (c) 2011 Jan Vesely
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty, Petr Manek
  * All rights reserved.
  *
@@ -39 +40 @@
 #include <errno.h>
 #include <io/log.h>
+#include <io/logctl.h>
 #include <str_error.h>
 
 #include <usb/debug.h>
-#include <usb/host/ddf_helpers.h>
 
 #include "hc.h"
+#include "ohci_bus.h"
 
 #define NAME "ohci"
-static errno_t 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 const hc_driver_t ohci_driver = {
+        .name = NAME,
+        .hc_device_size = sizeof(hc_t),
 
-
-static errno_t 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 errno_t 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.
- *
- * @param[in] device DDF instance of the device to initialize.
- * @return Error code.
- */
-static errno_t ohci_dev_add(ddf_dev_t *device)
-{
-        usb_log_debug("ohci_dev_add() called\n");
-        assert(device);
-        return hcd_ddf_add_hc(device, &ohci_hc_driver);
-}
-
-static const driver_ops_t ohci_driver_ops = {
-        .dev_add = ohci_dev_add,
-};
-
-static const driver_t ohci_driver = {
-        .name = NAME,
-        .driver_ops = &ohci_driver_ops
+        .hc_add = hc_add,
+        .irq_code_gen = hc_gen_irq_code,
+        .claim = hc_gain_control,
+        .start = hc_start,
+        .setup_root_hub = hc_setup_roothub,
+        .hc_gone = hc_gone,
 };
 
@@ -127 +73 @@
 {
         log_init(NAME);
-        return ddf_driver_main(&ohci_driver);
+        logctl_set_log_level(NAME, LVL_NOTE);
+        return hc_driver_main(&ohci_driver);
 }