Changeset e3f7418 in mainline for uspace/lib/usbdev/src/devdrv.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/lib/usbdev/src/devdrv.c (modified) (10 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -54 +54 @@
 };
 
-static usb_driver_t *driver = NULL;
+static const usb_driver_t *driver = NULL;
 
 
@@ -115 +115 @@
         int rc = usb_device_create_pipes(dev->ddf_dev, &dev->wire, endpoints,
             dev->descriptors.configuration, dev->descriptors.configuration_size,
-            dev->interface_no, alternate_setting,
-            &pipes, &pipes_count);
+            dev->interface_no, alternate_setting, &pipes, &pipes_count);
 
         if (rc != EOK) {
@@ -153 +152 @@
         gen_dev->driver_data = dev;
 
-        return driver->ops->device_add(dev);
+        rc = driver->ops->device_add(dev);
+        if (rc != EOK)
+                usb_device_destroy(dev);
+        return rc;
 }
 /*----------------------------------------------------------------------------*/
@@ -186 +188 @@
         if (driver->ops->device_gone == NULL)
                 return ENOTSUP;
-        const int ret = driver->ops->device_gone(gen_dev->driver_data);
+        usb_device_t *usb_dev = gen_dev->driver_data;
+        const int ret = driver->ops->device_gone(usb_dev);
         if (ret == EOK)
-                usb_device_destroy(gen_dev->driver_data);
+                usb_device_destroy(usb_dev);
 
         return ret;
@@ -319 +322 @@
 int usb_device_create_pipes(const ddf_dev_t *dev, usb_device_connection_t *wire,
     usb_endpoint_description_t **endpoints,
-    uint8_t *config_descr, size_t config_descr_size,
+    const uint8_t *config_descr, size_t config_descr_size,
     int interface_no, int interface_setting,
     usb_endpoint_mapping_t **pipes_ptr, size_t *pipes_count_ptr)
@@ -333 +336 @@
         int rc;
 
-        size_t pipe_count = count_other_pipes(endpoints);
+        const size_t pipe_count = count_other_pipes(endpoints);
         if (pipe_count == 0) {
+                *pipes_count_ptr = pipe_count;
                 *pipes_ptr = NULL;
                 return EOK;
@@ -445 +449 @@
 {
         assert(dev != NULL);
-        assert(((pipes != NULL) && (pipes_count > 0))
-            || ((pipes == NULL) && (pipes_count == 0)));
 
         if (pipes_count == 0) {
+                assert(pipes == NULL);
                 return EOK;
         }
+        assert(pipes != NULL);
 
         int rc;
@@ -468 +472 @@
         size_t i;
         for (i = 0; i < pipes_count; i++) {
-                usb_pipe_unregister(pipes[i].pipe, &hc_conn);
+                usb_log_debug2("Unregistering pipe %zu (%spresent).\n",
+                    i, pipes[i].present ? "" : "not ");
+                if (pipes[i].present)
+                        usb_pipe_unregister(pipes[i].pipe, &hc_conn);
                 free(pipes[i].pipe);
         }
@@ -592 +599 @@
 
         /* Ignore errors and hope for the best. */
-        usb_device_destroy_pipes(dev->ddf_dev, dev->pipes, dev->pipes_count);
-        free(dev->descriptors.configuration);
+        destroy_current_pipes(dev);
 
         if (dev->alternate_interfaces != NULL) {
@@ -599 +605 @@
         }
         free(dev->alternate_interfaces);
-
-        free(dev);
+        free(dev->descriptors.configuration);
+        free(dev->driver_data);
+}
+
+void * usb_device_data_alloc(usb_device_t *usb_dev, size_t size)
+{
+        assert(usb_dev);
+        assert(usb_dev->driver_data == NULL);
+        return usb_dev->driver_data = calloc(1, size);
+
 }