Changeset e3f7418 in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2011-10-15T13:06:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a044f71

Parents:

3958e315 (diff), 065064e6 (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:

USB improvements.

USB unplug part2; Unplug support in all drivers (except for unused usbmouse driver).
Make descriptor paring work on const pointers.
Fixes several crashes and memory leaks.

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (7 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);
+        return EOK;
+}
+
 /** Callback when new device is attached and recognized as a mass storage.
  *
@@ -94 +118 @@
 
         /* Allocate softstate */
-        dev->driver_data = mdev = malloc(sizeof(usbmast_dev_t));
+        mdev = usb_device_data_alloc(dev, sizeof(usbmast_dev_t));
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
@@ -112 +136 @@
 
         usb_log_debug("Get LUN count...\n");
-        mdev->luns = usb_masstor_get_lun_count(mdev);
-
-        for (i = 0; i < mdev->luns; i++) {
+        mdev->lun_count = usb_masstor_get_lun_count(mdev);
+        mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t*));
+        if (mdev->luns == NULL) {
+                rc = ENOMEM;
+                usb_log_error("Failed allocating luns table.\n");
+                goto error;
+        }
+
+        for (i = 0; i < mdev->lun_count; i++) {
                 rc = usbmast_fun_create(mdev, i);
                 if (rc != EOK)
@@ -122 +152 @@
         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;
 }
@@ -162 +204 @@
         }
 
+        mfun->ddf_fun = fun;
         mfun->mdev = mdev;
         mfun->lun = lun;
@@ -212 +255 @@
 
         free(fun_name);
+        mdev->luns[lun] = fun;
 
         return EOK;
@@ -295 +339 @@
 static usb_driver_ops_t usbmast_driver_ops = {
         .device_add = usbmast_device_add,
+        .device_gone = usbmast_device_gone,
 };