Changeset 3002434 in mainline

Timestamp:

2011-10-14T12:19:42Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

cc29622

Parents:

87037cc9

Message:

usbmast: Implement device_gone.

File:

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

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

@@ -82 +82 @@
     void *arg);
 
+/** Callback when a device is removed from the system.
+ *
+ * @param dev Representation of USB device.
+ * @return Error code.
+ */
+static int usbmast_device_gone(usb_device_t *dev)
+{
+        usbmast_dev_t *mdev = dev->driver_data;
+        assert(mdev);
+
+        for (size_t i = 0; i < mdev->lun_count; ++i) {
+                const int rc = ddf_fun_unbind(mdev->luns[i]);
+                if (rc != EOK) {
+                        usb_log_error("Failed to unbind LUN function %zu: "
+                            "%s\n", i, str_error(rc));
+                        return rc;
+                }
+                ddf_fun_destroy(mdev->luns[i]);
+                mdev->luns[i] = NULL;
+        }
+        free(mdev->luns);
+        free(mdev);
+        return EOK;
+}
+
 /** Callback when new device is attached and recognized as a mass storage.
  *
@@ -128 +153 @@
         return EOK;
 error:
-        /* XXX Destroy functions */
+        /* Destroy functions */
+        for (size_t i = 0; i < mdev->lun_count; ++i) {
+                if (mdev->luns[i] == NULL)
+                        continue;
+                const int rc = ddf_fun_unbind(mdev->luns[i]);
+                if (rc != EOK) {
+                        usb_log_warning("Failed to unbind LUN function %zu: "
+                            "%s.\n", i, str_error(rc));
+                }
+                ddf_fun_destroy(mdev->luns[i]);
+        }
+        free(mdev->luns);
+        free(mdev);
         return rc;
 }
@@ -303 +340 @@
 static usb_driver_ops_t usbmast_driver_ops = {
         .device_add = usbmast_device_add,
+        .device_gone = usbmast_device_gone,
 };