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

Timestamp:

2011-10-13T13:20:26Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3a5506a

Parents:

cff3fb6 (diff), 22a2b763 (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 initial USB unplug support.

Support device_remove and device_gone in libusbdev.
usbhub and uhcirh try to unbind and destroy functions of attached devices.
add unplug support for usbhub driver (only works on empty hubs as there is no support in other drivers).

Drivers to go:

usbmid
usbflbk
usbhid
usbmast
usbmouse

Tested on:

qemu UHCI and emulated hub,
ICH8 hw and Alcor Micro Corp. USB Hub

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (9 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 = {
@@ -123 +127 @@
         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 +151 @@
                 return rc;
         }
-
-        return driver->ops->add_device(dev);
-}
-
+        gen_dev->driver_data = dev;
+
+        return driver->ops->device_add(dev);
+}
+/*----------------------------------------------------------------------------*/
+/** 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;
+        const int ret = driver->ops->device_gone(gen_dev->driver_data);
+        if (ret == EOK)
+                usb_device_destroy(gen_dev->driver_data);
+
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
 /** Destroy existing pipes of a USB device.
  *
@@ -275 +317 @@
  * @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,
@@ -349 +391 @@
         }
 
-        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 +415 @@
         }
 
-        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 +441 @@
  * @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)
 {
@@ -426 +472 @@
         }
 
-        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);
@@ -545 +593 @@
         /* 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);
-        }
+        free(dev->descriptors.configuration);
 
         if (dev->alternate_interfaces != NULL) {
-                if (dev->alternate_interfaces->alternatives != NULL) {
-                        free(dev->alternate_interfaces->alternatives);
-                }
-                free(dev->alternate_interfaces);
-        }
+                free(dev->alternate_interfaces->alternatives);
+        }
+        free(dev->alternate_interfaces);
 
         free(dev);