Changeset dfa1fc8 in mainline

Timestamp:

2018-01-09T14:24:15Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

8eb7095

Parents:

0eadfd1e

Message:

usbdiag: use dev_removed for data cleanup

File:

• uspace/drv/bus/usb/usbdiag/main.c (modified) (4 diffs)

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

@@ -91 +91 @@
         }
 
-        usbdiag_dev_destroy(diag_dev);
-
         return EOK;
 
@@ -99 +97 @@
 }
 
+static int device_cleanup(usbdiag_dev_t *diag_dev)
+{
+        /* TODO: Join some fibrils? */
+
+        /* Free memory. */
+        usbdiag_dev_destroy(diag_dev);
+        return EOK;
+}
+
+static int device_removed(usb_device_t *dev)
+{
+        usb_log_info("Device '%s' removed.", usb_device_get_name(dev));
+
+        usbdiag_dev_t *diag_dev = usb_device_to_usbdiag_dev(dev);
+        return device_cleanup(diag_dev);
+}
+
 static int device_gone(usb_device_t *dev)
 {
+        int rc;
         usb_log_info("Device '%s' gone.", usb_device_get_name(dev));
 
@@ -106 +122 @@
 
         /* TODO: Make sure nothing is going on with the device. */
-        /* TODO: Unregister device DDF function. */
-        /* TODO: Remove device from list */
-
-        usbdiag_dev_destroy(diag_dev);
-
-        return EOK;
+
+        if ((rc = ddf_fun_unbind(diag_dev->fun))) {
+                usb_log_error("Failed to unbind DDF function: %s\n", str_error(rc));
+                goto err;
+        }
+
+        return device_cleanup(diag_dev);
+
+err:
+        return rc;
 }
 
@@ -187 +207 @@
         .device_add = device_add,
         .device_remove = device_remove,
+        .device_removed = device_removed,
         .device_gone = device_gone,
         .function_online = function_online,