Changeset 45bf63c in mainline for uspace/lib/usbdev

Timestamp:

2011-10-30T15:35:36Z (14 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.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/driver.h (modified) (3 diffs)
• src/altiface.c (modified) (4 diffs)
• src/devdrv.c (modified) (6 diffs)

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -161 +161 @@
 } usb_driver_t;
 
-int usb_driver_main(usb_driver_t *);
+int usb_driver_main(const usb_driver_t *);
 
 int usb_device_select_interface(usb_device_t *, uint8_t,
@@ -171 +171 @@
     usb_endpoint_mapping_t **, size_t *);
 int usb_device_destroy_pipes(const ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
-int usb_device_create(ddf_dev_t *, const usb_endpoint_description_t **,
-    usb_device_t **, const char **);
+int usb_device_init(usb_device_t *, ddf_dev_t *,
+    const usb_endpoint_description_t **, const char **);
 void usb_device_deinit(usb_device_t *);
+
 void * usb_device_data_alloc(usb_device_t *, size_t);
 
@@ -179 +180 @@
 int usb_alternate_interfaces_create(const uint8_t *, size_t, int,
     usb_alternate_interfaces_t **);
-
+void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *);
 #endif
 /**

uspace/lib/usbdev/src/altiface.c

@@ -98 +98 @@
         assert(config_descr_size > 0);
 
+        *alternates_ptr = NULL;
         if (interface_number < 0) {
-                alternates_ptr = NULL;
                 return EOK;
         }
@@ -105 +105 @@
         usb_alternate_interfaces_t *alternates
             = malloc(sizeof(usb_alternate_interfaces_t));
-
         if (alternates == NULL) {
                 return ENOMEM;
@@ -119 +118 @@
         }
 
-        alternates->alternatives = malloc(alternates->alternative_count
-            * sizeof(usb_alternate_interface_descriptors_t));
+        alternates->alternatives = calloc(alternates->alternative_count,
+            sizeof(usb_alternate_interface_descriptors_t));
         if (alternates->alternatives == NULL) {
                 free(alternates);
@@ -176 +175 @@
 }
 
-
+void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *alternate)
+{
+        if (!alternate)
+                return;
+        free(alternate->alternatives);
+        free(alternate);
+}
 /**
  * @}

uspace/lib/usbdev/src/devdrv.c

@@ -64 +64 @@
  * @return Task exit status.
  */
-int usb_driver_main(usb_driver_t *drv)
+int usb_driver_main(const usb_driver_t *drv)
 {
         assert(drv != NULL);
@@ -140 +140 @@
         assert(driver->ops->device_add);
 
-        int rc;
-
-        usb_device_t *dev = NULL;
+        usb_device_t *dev = ddf_dev_data_alloc(gen_dev, sizeof(usb_device_t));
+        if (dev == NULL) {
+                usb_log_error("USB device `%s' structure allocation failed.\n",
+                    gen_dev->name);
+                return ENOMEM;
+        }
         const char *err_msg = NULL;
-        rc = usb_device_create(gen_dev, driver->endpoints, &dev, &err_msg);
-        if (rc != EOK) {
-                usb_log_error("USB device `%s' creation failed (%s): %s.\n",
+        int rc = usb_device_init(dev, gen_dev, driver->endpoints, &err_msg);
+        if (rc != EOK) {
+                usb_log_error("USB device `%s' init failed (%s): %s.\n",
                     gen_dev->name, err_msg, str_error(rc));
                 return rc;
         }
-        gen_dev->driver_data = dev;
 
         rc = driver->ops->device_add(dev);
@@ -516 +518 @@
 
 
-/** Create new instance of USB device.
- *
+/** Initialize new instance of USB device.
+ *
+ * @param[in] usb_dev Pointer to the new device.
  * @param[in] ddf_dev Generic DDF device backing the USB one.
  * @param[in] endpoints NULL terminated array of endpoints (NULL for none).
- * @param[out] dev_ptr Where to store pointer to the new device.
  * @param[out] errstr_ptr Where to store description of context
  *      (in case error occurs).
  * @return Error code.
  */
-int usb_device_create(ddf_dev_t *ddf_dev,
-    const usb_endpoint_description_t **endpoints,
-    usb_device_t **dev_ptr, const char **errstr_ptr)
-{
-        assert(dev_ptr != NULL);
+int usb_device_init(usb_device_t *usb_dev, ddf_dev_t *ddf_dev,
+    const usb_endpoint_description_t **endpoints, const char **errstr_ptr)
+{
+        assert(usb_dev != NULL);
         assert(ddf_dev != NULL);
 
-        int rc;
-
-        usb_device_t *dev = malloc(sizeof(usb_device_t));
-        if (dev == NULL) {
-                *errstr_ptr = "structure allocation";
-                return ENOMEM;
-        }
-
-        // FIXME: proper deallocation in case of errors
-
-        dev->ddf_dev = ddf_dev;
-        dev->driver_data = NULL;
-        dev->descriptors.configuration = NULL;
-        dev->alternate_interfaces = NULL;
-
-        dev->pipes_count = 0;
-        dev->pipes = NULL;
+        usb_dev->ddf_dev = ddf_dev;
+        usb_dev->driver_data = NULL;
+        usb_dev->descriptors.configuration = NULL;
+        usb_dev->alternate_interfaces = NULL;
+        usb_dev->pipes_count = 0;
+        usb_dev->pipes = NULL;
 
         /* Initialize backing wire and control pipe. */
-        rc = init_wire_and_ctrl_pipe(dev, errstr_ptr);
+        int rc = init_wire_and_ctrl_pipe(usb_dev, errstr_ptr);
         if (rc != EOK) {
                 return rc;
@@ -557 +547 @@
 
         /* Get our interface. */
-        dev->interface_no = usb_device_get_assigned_interface(dev->ddf_dev);
+        usb_dev->interface_no = usb_device_get_assigned_interface(ddf_dev);
 
         /* Retrieve standard descriptors. */
-        rc = usb_device_retrieve_descriptors(&dev->ctrl_pipe,
-            &dev->descriptors);
-        if (rc != EOK) {
+        rc = usb_device_retrieve_descriptors(&usb_dev->ctrl_pipe,
+            &usb_dev->descriptors);
+        if (rc != EOK) {
+                /* Nothing allocated, nothing to free. */
                 *errstr_ptr = "descriptor retrieval";
                 return rc;
         }
 
-        /* Create alternate interfaces. */
-        rc = usb_alternate_interfaces_create(dev->descriptors.configuration,
-            dev->descriptors.configuration_size, dev->interface_no,
-            &dev->alternate_interfaces);
-        if (rc != EOK) {
-                /* We will try to silently ignore this. */
-                dev->alternate_interfaces = NULL;
-        }
-
-        rc = initialize_other_pipes(endpoints, dev, 0);
-        if (rc != EOK) {
+        /* Create alternate interfaces. We will silently ignore failure. */
+        //TODO Why ignore?
+        usb_alternate_interfaces_create(usb_dev->descriptors.configuration,
+            usb_dev->descriptors.configuration_size, usb_dev->interface_no,
+            &usb_dev->alternate_interfaces);
+
+        rc = initialize_other_pipes(endpoints, usb_dev, 0);
+        if (rc != EOK) {
+                /* Full configuration descriptor is allocated. */
+                free(usb_dev->descriptors.configuration);
+                /* Alternate interfaces may be allocated */
+                usb_alternate_interfaces_destroy(usb_dev->alternate_interfaces);
                 *errstr_ptr = "pipes initialization";
                 return rc;
@@ -583 +575 @@
 
         *errstr_ptr = NULL;
-        *dev_ptr = dev;
 
         return EOK;
 }
 
-/** Destroy instance of a USB device.
+/** Clean instance of a USB device.
  *
  * @param dev Device to be de-initialized.
@@ -596 +587 @@
 void usb_device_deinit(usb_device_t *dev)
 {
-        if (dev == NULL) {
-                return;
-        }
-
-        /* Ignore errors and hope for the best. */
-        destroy_current_pipes(dev);
-
-        if (dev->alternate_interfaces != NULL) {
-                free(dev->alternate_interfaces->alternatives);
-        }
-        free(dev->alternate_interfaces);
-        free(dev->descriptors.configuration);
-        free(dev->driver_data);
+        if (dev) {
+                /* Ignore errors and hope for the best. */
+                destroy_current_pipes(dev);
+
+                usb_alternate_interfaces_destroy(dev->alternate_interfaces);
+                free(dev->descriptors.configuration);
+                free(dev->driver_data);
+        }
 }