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

Timestamp:

2011-10-30T19:50:54Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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 mainline changes

File:

• uspace/drv/bus/usb/usbmid/main.c (modified) (1 diff)

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

@@ -65 +65 @@
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+/** Callback when a MID device is about to be removed from the host.
+ *
+ * @param gen_dev Generic DDF device representing the removed device.
+ * @return Error code.
+ */
+static int usbmid_device_remove(usb_device_t *dev)
+{
+        assert(dev);
+        int ret = ENOTSUP;
+        usb_mid_t *usb_mid = dev->driver_data;
+        assert(usb_mid);
+
+        /* Signal all interface functions */
+        list_foreach(usb_mid->interface_list, item) {
+                usbmid_interface_t *iface = usbmid_interface_from_link(item);
+
+                usb_log_info("Signaling remove to child for interface "
+                    "%d (%s).\n", iface->interface_no,
+                    usb_str_class(iface->interface->interface_class));
+                // TODO cascade the call.
+        }
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
+/** Callback when a MID device was removed from the host.
+ *
+ * @param gen_dev Generic DDF device representing the removed device.
+ * @return Error code.
+ */
+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 = 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));
+
+                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 = {
+static const usb_driver_ops_t mid_driver_ops = {
         .device_add = usbmid_device_add,
+        .device_rem = usbmid_device_remove,
+        .device_gone = usbmid_device_gone,
 };
 
 /** USB MID driver. */
-static usb_driver_t mid_driver = {
+static const usb_driver_t mid_driver = {
         .name = NAME,
         .ops = &mid_driver_ops,