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

Timestamp:

2011-10-30T15:35:36Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

20a3465, 3ce78580

Parents:

1737bfb (diff), e978ada (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 USB branch.

Cleanup libusbhost interfaces.
Fix few possible memory corruption/crashes and memory leaks.
Add device_remove hooks for usbflbk, usbhid.

File:

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

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)
 {
@@ -86 +115 @@
                 list_remove(item);
 
-                usbmid_interface_t *iface = list_get_instance(item,
-                    usbmid_interface_t, link);
+                usbmid_interface_t *iface = usbmid_interface_from_link(item);
 
                 usb_log_info("Removing child for interface %d (%s).\n",
@@ -107 +135 @@
 
 /** 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,