Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbmid/main.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/usbmid/main.c (modified) (6 diffs)

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

@@ -51 +51 @@
 static int usbmid_device_add(usb_device_t *dev)
 {
-        usb_log_info("Taking care of new MID `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
+        usb_log_info("Taking care of new MID `%s'.\n", usb_device_get_name(dev));
 
-        const bool accept = usbmid_explore_device(dev);
-
-        if (!accept) {
-                return ENOTSUP;
-        }
-
-        return EOK;
+        return usbmid_explore_device(dev);
 }
 
@@ -70 +64 @@
 {
         assert(dev);
-        usb_mid_t *usb_mid = dev->driver_data;
+        usb_mid_t *usb_mid = usb_device_data_get(dev);
         assert(usb_mid);
 
@@ -89 +83 @@
                 usbmid_interface_t *iface = usbmid_interface_from_link(item);
 
-                usb_log_info("Removing child for interface %d (%s).\n",
-                    iface->interface_no,
-                    usb_str_class(iface->interface->interface_class));
+                usb_log_info("Removing child `%s'.\n",
+                    ddf_fun_get_name(iface->fun));
 
                 /* Tell the child to go off-line. */
                 int pret = ddf_fun_offline(iface->fun);
                 if (pret != EOK) {
-                        usb_log_warning("Failed to turn off child for interface"
-                            " %d (%s): %s\n", iface->interface_no,
-                            usb_str_class(iface->interface->interface_class),
-                            str_error(pret));
+                        usb_log_warning("Failed to turn off child `%s': %s\n",
+                            ddf_fun_get_name(iface->fun), str_error(pret));
                         ret = pret;
                 }
@@ -106 +97 @@
                 pret = usbmid_interface_destroy(iface);
                 if (pret != EOK) {
-                        usb_log_error("Failed to destroy child for interface "
-                            "%d (%s): %s\n", iface->interface_no,
-                            usb_str_class(iface->interface->interface_class),
-                            str_error(pret));
+                        usb_log_error("Failed to destroy child `%s': %s\n",
+                            ddf_fun_get_name(iface->fun), str_error(pret));
                         ret = pret;
                 }
@@ -124 +113 @@
 {
         assert(dev);
-        usb_mid_t *usb_mid = dev->driver_data;
+        usb_mid_t *usb_mid = usb_device_data_get(dev);
         assert(usb_mid);
 
-        usb_log_info("USB MID gone: `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
+        usb_log_info("USB MID gone: `%s'.\n", usb_device_get_name(dev));
 
         /* Remove ctl function */
@@ -145 +134 @@
                 usbmid_interface_t *iface = usbmid_interface_from_link(item);
 
-                usb_log_info("Child for interface %d (%s) gone.\n",
-                    iface->interface_no,
-                    usb_str_class(iface->interface->interface_class));
+                usb_log_info("Child `%s' is gone.\n",
+                    ddf_fun_get_name(iface->fun));
 
                 const int pret = usbmid_interface_destroy(iface);
                 if (pret != EOK) {
-                        usb_log_error("Failed to remove child for interface "
-                            "%d (%s): %s\n",
-                            iface->interface_no,
-                            usb_str_class(iface->interface->interface_class),
-                            str_error(pret));
+                        usb_log_error("Failed to remove child `%s': %s\n",
+                            ddf_fun_get_name(iface->fun), str_error(pret));
                         ret = pret;
                 }