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

Timestamp:

2018-02-28T16:37:50Z (7 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/uhci/main.c (modified) (6 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky, Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty, Petr Manek
  * All rights reserved.
  *
@@ -43 +44 @@
 #include <str_error.h>
 #include <usb/debug.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include "hc.h"
@@ -49 +50 @@
 #define NAME "uhci"
 
-static errno_t uhci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
-static void uhci_driver_fini(hcd_t *);
-static errno_t disable_legacy(ddf_dev_t *);
+static errno_t disable_legacy(hc_device_t *);
 
-static const ddf_hc_driver_t uhci_hc_driver = {
-        .claim = disable_legacy,
-        .hc_speed = USB_SPEED_FULL,
-        .irq_code_gen = uhci_hc_gen_irq_code,
-        .init = uhci_driver_init,
-        .fini = uhci_driver_fini,
-        .name = "UHCI",
-        .ops = {
-                .schedule    = uhci_hc_schedule,
-                .irq_hook    = uhci_hc_interrupt,
-                .status_hook = uhci_hc_status,
-        },
+static const hc_driver_t uhci_driver = {
+        .name = NAME,
+        .hc_device_size = sizeof(hc_t),
+        .claim = disable_legacy,
+        .irq_code_gen = hc_gen_irq_code,
+        .hc_add = hc_add,
+        .start = hc_start,
+        .setup_root_hub = hc_setup_roothub,
+        .hc_gone = hc_gone,
 };
-
-static errno_t uhci_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, &uhci_hc_driver.ops);
-        } else {
-                free(instance);
-        }
-        return ret;
-}
-
-static void uhci_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);
-}
 
 /** Call the PCI driver with a request to clear legacy support register
@@ -101 +68 @@
  * @return Error code.
  */
-static errno_t disable_legacy(ddf_dev_t *device)
+static errno_t disable_legacy(hc_device_t *hcd)
 {
-        assert(device);
+        assert(hcd);
 
-        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(hcd->ddf_dev);
         if (parent_sess == NULL)
                 return ENOMEM;
@@ -113 +80 @@
         return pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
 }
-
-/** Initialize a new ddf driver instance for uhci hc and hub.
- *
- * @param[in] device DDF instance of the device to initialize.
- * @return Error code.
- */
-static errno_t uhci_dev_add(ddf_dev_t *device)
-{
-        usb_log_debug2("uhci_dev_add() called\n");
-        assert(device);
-        return hcd_ddf_add_hc(device, &uhci_hc_driver);
-}
-
-static const driver_ops_t uhci_driver_ops = {
-        .dev_add = uhci_dev_add,
-};
-
-static const driver_t uhci_driver = {
-        .name = NAME,
-        .driver_ops = &uhci_driver_ops
-};
-
 
 /** Initialize global driver structures (NONE).
@@ -149 +94 @@
         log_init(NAME);
         logctl_set_log_level(NAME, LVL_NOTE);
-        return ddf_driver_main(&uhci_driver);
+        return hc_driver_main(&uhci_driver);
 }
 /**