Changeset df6ded8 in mainline for uspace/drv/bus/usb/vhc/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/vhc/main.c (modified) (4 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -40 +41 @@
 
 #include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include <usb/debug.h>
@@ -69 +71 @@
                 return ret;
         }
-        vhc_init(vhc);
         return EOK;
 }
 
-hcd_ops_t vhc_hc_ops = {
-        .schedule = vhc_schedule,
-};
-
 static errno_t vhc_dev_add(ddf_dev_t *dev)
 {
+        /* Initialize generic structures */
+        errno_t ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t));
+        if (ret != EOK) {
+                usb_log_error("Failed to init HCD structures: %s.",
+                   str_error(ret));
+                return ret;
+        }
+        vhc_data_t *vhc = ddf_dev_data_get(dev);
+        vhc_init(vhc);
+
+        hc_device_setup(&vhc->base, (bus_t *) &vhc->bus);
+
         /* Initialize virtual structure */
         ddf_fun_t *ctl_fun = NULL;
-        errno_t ret = vhc_control_node(dev, &ctl_fun);
+        ret = vhc_control_node(dev, &ctl_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to setup control node.\n");
-                return ret;
-        }
-        vhc_data_t *data = ddf_fun_data_get(ctl_fun);
-
-        /* Initialize generic structures */
-        ret = hcd_ddf_setup_hc(dev, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
-        if (ret != EOK) {
-                usb_log_error("Failed to init HCD structures: %s.\n",
-                   str_error(ret));
-                ddf_fun_destroy(ctl_fun);
+                usb_log_error("Failed to setup control node.");
                 return ret;
         }
 
-        hcd_set_implementation(dev_to_hcd(dev), data, &vhc_hc_ops);
-
         /* Add virtual hub device */
-        ret = vhc_virtdev_plug_hub(data, &data->hub, NULL, 0);
+        ret = vhc_virtdev_plug_hub(vhc, &vhc->hub, NULL, 0);
         if (ret != EOK) {
-                usb_log_error("Failed to plug root hub: %s.\n", str_error(ret));
+                usb_log_error("Failed to plug root hub: %s.", str_error(ret));
                 ddf_fun_destroy(ctl_fun);
                 return ret;
@@ -112 +108 @@
          * needs to be ready at this time.
          */
-        ret = hcd_ddf_setup_root_hub(dev);
+        ret = hc_setup_virtual_root_hub(&vhc->base, USB_SPEED_HIGH);
         if (ret != EOK) {
-                usb_log_error("Failed to init VHC root hub: %s\n",
+                usb_log_error("Failed to init VHC root hub: %s",
                         str_error(ret));
                 // TODO do something here...