Changeset df6ded8 in mainline for uspace/lib/usbdev/src/driver.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/lib/usbdev/src/driver.c (modified) (4 diffs)

uspace/lib/usbdev/src/driver.c

@@ -2 +2 @@
  * Copyright (c) 2011 Vojtech Horky
  * Copyright (c) 2013 Jan Vesely
+ * Copyright (c) 2018 Petr Manek
  * All rights reserved.
  *
@@ -62 +63 @@
         errno_t rc = usb_device_create_ddf(gen_dev, driver->endpoints, &err_msg);
         if (rc != EOK) {
-                usb_log_error("USB device `%s' init failed (%s): %s.\n",
+                usb_log_error("USB device `%s' init failed (%s): %s.",
                     ddf_dev_get_name(gen_dev), err_msg, str_error(rc));
                 return rc;
@@ -85 +86 @@
         assert(driver);
         assert(driver->ops);
-        if (driver->ops->device_rem == NULL)
+        if (driver->ops->device_remove == NULL)
                 return ENOTSUP;
+
         /* Just tell the driver to stop whatever it is doing */
         usb_device_t *usb_dev = ddf_dev_data_get(gen_dev);
-        const errno_t ret = driver->ops->device_rem(usb_dev);
+        const errno_t ret = driver->ops->device_remove(usb_dev);
         if (ret != EOK)
                 return ret;
+
         usb_device_destroy_ddf(gen_dev);
         return EOK;
@@ -117 +120 @@
 }
 
+/** Callback when the driver is asked to online a specific function.
+ *
+ * This callback is a wrapper for USB specific version of @c fun_online.
+ *
+ * @param gen_dev Device function structure as prepared by DDF.
+ * @return Error code.
+ */
+static int generic_function_online(ddf_fun_t *fun)
+{
+        assert(driver);
+        assert(driver->ops);
+        if (driver->ops->function_online == NULL)
+                return ENOTSUP;
+        return driver->ops->function_online(fun);
+}
+
+/** Callback when the driver is asked to offline a specific function.
+ *
+ * This callback is a wrapper for USB specific version of @c fun_offline.
+ *
+ * @param gen_dev Device function structure as prepared by DDF.
+ * @return Error code.
+ */
+static int generic_function_offline(ddf_fun_t *fun)
+{
+        assert(driver);
+        assert(driver->ops);
+        if (driver->ops->function_offline == NULL)
+                return ENOTSUP;
+        return driver->ops->function_offline(fun);
+}
+
 static driver_ops_t generic_driver_ops = {
         .dev_add = generic_device_add,
         .dev_remove = generic_device_remove,
         .dev_gone = generic_device_gone,
+        .fun_online = generic_function_online,
+        .fun_offline = generic_function_offline,
 };
 static driver_t generic_driver = {