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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Petr Manek, Ondrej Hlavaty
  * All rights reserved.
  *
@@ -51 +52 @@
 static errno_t usbmid_device_add(usb_device_t *dev)
 {
-        usb_log_info("Taking care of new MID `%s'.\n", usb_device_get_name(dev));
+        usb_log_info("Taking care of new MID `%s'.", usb_device_get_name(dev));
 
         return usbmid_explore_device(dev);
+}
+
+static errno_t destroy_interfaces(usb_mid_t *usb_mid)
+{
+        errno_t ret = EOK;
+
+        while (!list_empty(&usb_mid->interface_list)) {
+                link_t *item = list_first(&usb_mid->interface_list);
+                list_remove(item);
+
+                usbmid_interface_t *iface = usbmid_interface_from_link(item);
+
+                const errno_t pret = usbmid_interface_destroy(iface);
+                if (pret != EOK) {
+                        usb_log_error("Failed to remove child `%s': %s",
+                            ddf_fun_get_name(iface->fun), str_error(pret));
+                        ret = pret;
+                }
+        }
+
+        return ret;
 }
 
@@ -70 +92 @@
         errno_t ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to unbind USB MID ctl function: %s.\n",
+                usb_log_error("Failed to unbind USB MID ctl function: %s.",
                     str_error(ret));
                 return ret;
@@ -77 +99 @@
 
         /* Remove all children */
-        while (!list_empty(&usb_mid->interface_list)) {
-                link_t *item = list_first(&usb_mid->interface_list);
-                list_remove(item);
-
-                usbmid_interface_t *iface = usbmid_interface_from_link(item);
-
-                usb_log_info("Removing child `%s'.\n",
+        list_foreach(usb_mid->interface_list, link, usbmid_interface_t, iface) {
+                usb_log_info("Removing child `%s'.",
                     ddf_fun_get_name(iface->fun));
 
-                /* Tell the child to go off-line. */
+                /* Tell the child to go offline. */
                 errno_t pret = ddf_fun_offline(iface->fun);
                 if (pret != EOK) {
-                        usb_log_warning("Failed to turn off child `%s': %s\n",
+                        usb_log_warning("Failed to turn off child `%s': %s",
                             ddf_fun_get_name(iface->fun), str_error(pret));
-                        ret = pret;
-                }
-
-                /* Now remove the child. */
-                pret = usbmid_interface_destroy(iface);
-                if (pret != EOK) {
-                        usb_log_error("Failed to destroy child `%s': %s\n",
-                            ddf_fun_get_name(iface->fun), str_error(pret));
-                        ret = pret;
                 }
         }
-        return ret;
+
+        return destroy_interfaces(usb_mid);
 }
 
@@ -116 +125 @@
         assert(usb_mid);
 
-        usb_log_info("USB MID gone: `%s'.\n", usb_device_get_name(dev));
+        usb_log_info("USB MID gone: `%s'.", usb_device_get_name(dev));
 
         /* Remove ctl function */
         errno_t ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to unbind USB MID ctl function: %s.\n",
+                usb_log_error("Failed to unbind USB MID ctl function: %s.",
                     str_error(ret));
                 return ret;
@@ -127 +136 @@
         ddf_fun_destroy(usb_mid->ctl_fun);
 
-        /* Now remove all other functions */
-        while (!list_empty(&usb_mid->interface_list)) {
-                link_t *item = list_first(&usb_mid->interface_list);
-                list_remove(item);
+        /* Destroy children and tell their drivers they are gone. */
+        return destroy_interfaces(usb_mid);
+}
 
-                usbmid_interface_t *iface = usbmid_interface_from_link(item);
+static errno_t usbmid_function_online(ddf_fun_t *fun)
+{
+        usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        usb_mid_t *usb_mid = usb_device_data_get(usb_dev);
+        if (fun == usb_mid->ctl_fun)
+                return ENOTSUP;
 
-                usb_log_info("Child `%s' is gone.\n",
-                    ddf_fun_get_name(iface->fun));
+        return ddf_fun_online(fun);
+}
 
-                const errno_t pret = usbmid_interface_destroy(iface);
-                if (pret != EOK) {
-                        usb_log_error("Failed to remove child `%s': %s\n",
-                            ddf_fun_get_name(iface->fun), str_error(pret));
-                        ret = pret;
-                }
-        }
-        return ret;
+static errno_t usbmid_function_offline(ddf_fun_t *fun)
+{
+        usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        usb_mid_t *usb_mid = usb_device_data_get(usb_dev);
+        if (fun == usb_mid->ctl_fun)
+                return ENOTSUP;
+
+        return ddf_fun_offline(fun);
 }
 
@@ -150 +163 @@
 static const usb_driver_ops_t mid_driver_ops = {
         .device_add = usbmid_device_add,
-        .device_rem = usbmid_device_remove,
+        .device_remove = usbmid_device_remove,
         .device_gone = usbmid_device_gone,
+        .function_online = usbmid_function_online,
+        .function_offline = usbmid_function_offline
 };