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

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

File:

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

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

@@ -49 +49 @@
  * @return Error code.
  */
-static int usbmid_add_device(usb_device_t *dev)
+static int usbmid_device_add(usb_device_t *dev)
 {
         usb_log_info("Taking care of new MID `%s'.\n", dev->ddf_dev->name);
@@ -66 +66 @@
 }
 
+static int usbmid_device_gone(usb_device_t *dev)
+{
+        assert(dev);
+        usb_log_info("USB MID gone: `%s'.\n", dev->ddf_dev->name);
+
+        /* Remove ctl function */
+        usb_mid_t *usb_mid = dev->driver_data;
+        int ret = ddf_fun_unbind(usb_mid->ctl_fun);
+        if (ret != EOK) {
+                usb_log_error("Failed to unbind USB MID ctl function: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
+        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);
+
+                usbmid_interface_t *iface = list_get_instance(item,
+                    usbmid_interface_t, link);
+
+                usb_log_info("Removing child for interface %d (%s).\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 for interface "
+                            "%d (%s): %s\n",
+                            iface->interface_no,
+                            usb_str_class(iface->interface->interface_class),
+                            str_error(pret));
+                        ret = pret;
+                }
+        }
+        return ret;
+}
+
 /** USB MID driver ops. */
 static usb_driver_ops_t mid_driver_ops = {
-        .add_device = usbmid_add_device,
+        .device_add = usbmid_device_add,
+        .device_gone = usbmid_device_gone,
 };