Changes in uspace/drv/bus/usb/usbmid/main.c [6785b538:920d0fc] in mainline

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", usb_device_get_name(dev));
+        usb_log_info("Taking care of new MID `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
 
-        return usbmid_explore_device(dev);
+        const bool accept = usbmid_explore_device(dev);
+
+        if (!accept) {
+                return ENOTSUP;
+        }
+
+        return EOK;
 }
 
@@ -64 +70 @@
 {
         assert(dev);
-        usb_mid_t *usb_mid = usb_device_data_get(dev);
+        usb_mid_t *usb_mid = dev->driver_data;
         assert(usb_mid);
 
@@ -83 +89 @@
                 usbmid_interface_t *iface = usbmid_interface_from_link(item);
 
-                usb_log_info("Removing child `%s'.\n",
-                    ddf_fun_get_name(iface->fun));
+                usb_log_info("Removing child for interface %d (%s).\n",
+                    iface->interface_no,
+                    usb_str_class(iface->interface->interface_class));
 
                 /* 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 `%s': %s\n",
-                            ddf_fun_get_name(iface->fun), str_error(pret));
+                        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));
                         ret = pret;
                 }
@@ -97 +106 @@
                 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));
+                        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));
                         ret = pret;
                 }
@@ -113 +124 @@
 {
         assert(dev);
-        usb_mid_t *usb_mid = usb_device_data_get(dev);
+        usb_mid_t *usb_mid = dev->driver_data;
         assert(usb_mid);
 
-        usb_log_info("USB MID gone: `%s'.\n", usb_device_get_name(dev));
+        usb_log_info("USB MID gone: `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
 
         /* Remove ctl function */
@@ -134 +145 @@
                 usbmid_interface_t *iface = usbmid_interface_from_link(item);
 
-                usb_log_info("Child `%s' is gone.\n",
-                    ddf_fun_get_name(iface->fun));
+                usb_log_info("Child for interface %d (%s) gone.\n",
+                    iface->interface_no,
+                    usb_str_class(iface->interface->interface_class));
 
                 const int 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));
+                        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));
                         ret = pret;
                 }