Changes in uspace/lib/usbdev/src/devdrv.c [065064e6:fb422312] in mainline

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (10 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -54 +54 @@
 };
 
-static const usb_driver_t *driver = NULL;
+static 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) {
@@ -152 +153 @@
         gen_dev->driver_data = dev;
 
-        rc = driver->ops->device_add(dev);
-        if (rc != EOK)
-                usb_device_destroy(dev);
-        return rc;
+        return driver->ops->device_add(dev);
 }
 /*----------------------------------------------------------------------------*/
@@ -188 +186 @@
         if (driver->ops->device_gone == NULL)
                 return ENOTSUP;
-        usb_device_t *usb_dev = gen_dev->driver_data;
-        const int ret = driver->ops->device_gone(usb_dev);
+        const int ret = driver->ops->device_gone(gen_dev->driver_data);
         if (ret == EOK)
-                usb_device_destroy(usb_dev);
+                usb_device_destroy(gen_dev->driver_data);
 
         return ret;
@@ -322 +319 @@
 int usb_device_create_pipes(const ddf_dev_t *dev, usb_device_connection_t *wire,
     usb_endpoint_description_t **endpoints,
-    const uint8_t *config_descr, size_t config_descr_size,
+    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)
@@ -336 +333 @@
         int rc;
 
-        const size_t pipe_count = count_other_pipes(endpoints);
+        size_t pipe_count = count_other_pipes(endpoints);
         if (pipe_count == 0) {
-                *pipes_count_ptr = pipe_count;
                 *pipes_ptr = NULL;
                 return EOK;
@@ -449 +445 @@
 {
         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;
@@ -472 +468 @@
         size_t i;
         for (i = 0; i < pipes_count; i++) {
-                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);
+                usb_pipe_unregister(pipes[i].pipe, &hc_conn);
                 free(pipes[i].pipe);
         }
@@ -599 +592 @@
 
         /* Ignore errors and hope for the best. */
-        destroy_current_pipes(dev);
+        usb_device_destroy_pipes(dev->ddf_dev, dev->pipes, dev->pipes_count);
+        free(dev->descriptors.configuration);
 
         if (dev->alternate_interfaces != NULL) {
@@ -605 +599 @@
         }
         free(dev->alternate_interfaces);
-        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);
-
+
+        free(dev);
 }