Changeset 25696fea in mainline for uspace/lib/usbdev/src/devdrv.c

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

File:

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

uspace/lib/usbdev/src/devdrv.c

@@ -41 +41 @@
 #include <assert.h>
 
-static int generic_add_device(ddf_dev_t *);
+static int generic_device_add(ddf_dev_t *);
+static int generic_device_remove(ddf_dev_t *);
+static int generic_device_gone(ddf_dev_t *);
 
 static driver_ops_t generic_driver_ops = {
-        .add_device = generic_add_device
+        .add_device = generic_device_add,
+        .dev_remove = generic_device_remove,
+        .dev_gone = generic_device_gone,
 };
 static driver_t generic_driver = {
@@ -50 +54 @@
 };
 
-static usb_driver_t *driver = NULL;
+static const usb_driver_t *driver = NULL;
 
 
@@ -111 +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) {
@@ -123 +126 @@
         return EOK;
 }
-
-/** Callback when new device is supposed to be controlled by this driver.
- *
- * This callback is a wrapper for USB specific version of @c add_device.
+/*----------------------------------------------------------------------------*/
+/** Callback when a new device is supposed to be controlled by this driver.
+ *
+ * This callback is a wrapper for USB specific version of @c device_add.
  *
  * @param gen_dev Device structure as prepared by DDF.
  * @return Error code.
  */
-int generic_add_device(ddf_dev_t *gen_dev)
+int generic_device_add(ddf_dev_t *gen_dev)
 {
         assert(driver);
         assert(driver->ops);
-        assert(driver->ops->add_device);
+        assert(driver->ops->device_add);
 
         int rc;
@@ -147 +150 @@
                 return rc;
         }
-
-        return driver->ops->add_device(dev);
-}
-
+        gen_dev->driver_data = dev;
+
+        rc = driver->ops->device_add(dev);
+        if (rc != EOK)
+                usb_device_destroy(dev);
+        return rc;
+}
+/*----------------------------------------------------------------------------*/
+/** Callback when a device is supposed to be removed from the system.
+ *
+ * This callback is a wrapper for USB specific version of @c device_remove.
+ *
+ * @param gen_dev Device structure as prepared by DDF.
+ * @return Error code.
+ */
+int generic_device_remove(ddf_dev_t *gen_dev)
+{
+        assert(driver);
+        assert(driver->ops);
+        if (driver->ops->device_rem == NULL)
+                return ENOTSUP;
+        /* Just tell the driver to stop whatever it is doing, keep structures */
+        return driver->ops->device_rem(gen_dev->driver_data);
+}
+/*----------------------------------------------------------------------------*/
+/** Callback when a device was removed from the system.
+ *
+ * This callback is a wrapper for USB specific version of @c device_gone.
+ *
+ * @param gen_dev Device structure as prepared by DDF.
+ * @return Error code.
+ */
+int generic_device_gone(ddf_dev_t *gen_dev)
+{
+        assert(driver);
+        assert(driver->ops);
+        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);
+        if (ret == EOK)
+                usb_device_destroy(usb_dev);
+
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
 /** Destroy existing pipes of a USB device.
  *
@@ -275 +320 @@
  * @return Error code.
  */
-int usb_device_create_pipes(ddf_dev_t *dev, usb_device_connection_t *wire,
+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)
@@ -291 +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;
@@ -349 +395 @@
         }
 
-        usb_hc_connection_close(&hc_conn);
+        if (usb_hc_connection_close(&hc_conn) != EOK)
+                usb_log_warning("usb_device_create_pipes(): "
+                    "Failed to close connection.\n");
 
         *pipes_ptr = pipes;
@@ -371 +419 @@
         }
 
-        usb_hc_connection_close(&hc_conn);
+        if (usb_hc_connection_close(&hc_conn) != EOK)
+                usb_log_warning("usb_device_create_pipes(): "
+                    "Failed to close connection.\n");
 
         /*
@@ -395 +445 @@
  * @param[in] pipes_count Number of endpoints.
  */
-int usb_device_destroy_pipes(ddf_dev_t *dev,
+int usb_device_destroy_pipes(const ddf_dev_t *dev,
     usb_endpoint_mapping_t *pipes, size_t pipes_count)
 {
         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;
@@ -422 +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);
         }
 
-        usb_hc_connection_close(&hc_conn);
+        if (usb_hc_connection_close(&hc_conn) != EOK)
+                usb_log_warning("usb_device_destroy_pipes(): "
+                    "Failed to close connection.\n");
 
         free(pipes);
@@ -544 +599 @@
 
         /* Ignore errors and hope for the best. */
-        usb_device_destroy_pipes(dev->ddf_dev, dev->pipes, dev->pipes_count);
-        if (dev->descriptors.configuration != NULL) {
-                free(dev->descriptors.configuration);
-        }
+        destroy_current_pipes(dev);
 
         if (dev->alternate_interfaces != NULL) {
-                if (dev->alternate_interfaces->alternatives != NULL) {
-                        free(dev->alternate_interfaces->alternatives);
-                }
-                free(dev->alternate_interfaces);
-        }
-
-        free(dev);
+                free(dev->alternate_interfaces->alternatives);
+        }
+        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);
+
 }