Changeset 7363fc1 in mainline

Timestamp:

2013-01-27T11:52:37Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7d20461

Parents:

87619045

Message:

libusbdev: Add usb_device constructor using devman handle.

Fix initialization error paths.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/device.h (modified) (1 diff)
• src/devdrv.c (modified) (12 diffs)

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

@@ -46 +46 @@
 void usb_device_destroy_ddf(ddf_dev_t *);
 
-const char* usb_device_get_name(usb_device_t *);
+usb_device_t * usb_device_create(devman_handle_t);
+void usb_device_destroy(usb_device_t *);
+
+const char * usb_device_get_name(usb_device_t *);
 ddf_fun_t *usb_device_ddf_fun_create(usb_device_t *, fun_type_t, const char *);
 

uspace/lib/usbdev/src/devdrv.c

@@ -389 +389 @@
 }
 
+/** Clean instance of a USB device.
+ *
+ * @param dev Device to be de-initialized.
+ *
+ * Does not free/destroy supplied pointer.
+ */
+static void usb_device_fini(usb_device_t *usb_dev)
+{
+        if (usb_dev) {
+                usb_dev_disconnect(usb_dev->bus_session);
+                /* Destroy existing pipes. */
+                usb_device_destroy_pipes(usb_dev);
+                /* Ignore errors and hope for the best. */
+                usb_hc_connection_deinitialize(&usb_dev->hc_conn);
+                usb_alternate_interfaces_deinit(&usb_dev->alternate_interfaces);
+                usb_device_release_descriptors(usb_dev);
+                free(usb_dev->driver_data);
+                usb_dev->driver_data = NULL;
+        }
+}
+
 /** Initialize new instance of USB device.
  *
@@ -399 +420 @@
  */
 static int usb_device_init(usb_device_t *usb_dev, ddf_dev_t *ddf_dev,
-    const usb_endpoint_description_t **endpoints, const char **errstr_ptr)
+    const usb_endpoint_description_t **endpoints, const char **errstr_ptr,
+    devman_handle_t handle)
 {
         assert(usb_dev != NULL);
         assert(ddf_dev != NULL);
+        assert(errstr_ptr);
 
         *errstr_ptr = NULL;
@@ -412 +435 @@
         usb_dev->pipes = NULL;
 
-        usb_dev->bus_session = usb_dev_connect_to_self(ddf_dev);
+        if (ddf_dev)
+                usb_dev->bus_session = usb_dev_connect_to_self(ddf_dev);
+        else
+                usb_dev->bus_session = usb_dev_connect(handle);
+
         if (!usb_dev->bus_session) {
                 *errstr_ptr = "device bus session create";
@@ -425 +452 @@
             &hc_handle, &address, &usb_dev->interface_no);
         if (rc != EOK) {
+                usb_dev_disconnect(usb_dev->bus_session);
                 *errstr_ptr = "device parameters retrieval";
                 return rc;
@@ -436 +464 @@
             &usb_dev->wire, &usb_dev->hc_conn, address);
         if (rc != EOK) {
+                usb_dev_disconnect(usb_dev->bus_session);
                 *errstr_ptr = "device connection initialization";
                 return rc;
@@ -445 +474 @@
             &usb_dev->ctrl_pipe, &usb_dev->wire);
         if (rc != EOK) {
+                usb_dev_disconnect(usb_dev->bus_session);
                 *errstr_ptr = "default control pipe initialization";
                 return rc;
@@ -452 +482 @@
         rc = usb_hc_connection_open(&usb_dev->hc_conn);
         if (rc != EOK) {
+                usb_dev_disconnect(usb_dev->bus_session);
                 *errstr_ptr = "hc connection open";
                 return rc;
@@ -461 +492 @@
                 *errstr_ptr = "descriptor retrieval";
                 usb_hc_connection_close(&usb_dev->hc_conn);
+                usb_dev_disconnect(usb_dev->bus_session);
                 return rc;
         }
@@ -472 +504 @@
             usb_dev->descriptors.configuration_size, usb_dev->interface_no);
 
-        /* Create and register other pipes than default control (EP 0) */
-        rc = usb_device_create_pipes(usb_dev, endpoints);
-        if (rc != EOK) {
-                usb_hc_connection_close(&usb_dev->hc_conn);
-                /* Full configuration descriptor is allocated. */
-                usb_device_release_descriptors(usb_dev);
-                /* Alternate interfaces may be allocated */
-                usb_alternate_interfaces_deinit(&usb_dev->alternate_interfaces);
-                *errstr_ptr = "pipes initialization";
-                return rc;
+        if (endpoints) {
+                /* Create and register other pipes than default control (EP 0)*/
+                rc = usb_device_create_pipes(usb_dev, endpoints);
+                if (rc != EOK) {
+                        usb_hc_connection_close(&usb_dev->hc_conn);
+                        usb_device_fini(usb_dev);
+                        *errstr_ptr = "pipes initialization";
+                        return rc;
+                }
         }
 
@@ -488 +519 @@
 }
 
-/** Clean instance of a USB device.
- *
- * @param dev Device to be de-initialized.
- *
- * Does not free/destroy supplied pointer.
- */
-static void usb_device_fini(usb_device_t *dev)
-{
-        if (dev) {
-                usb_dev_disconnect(dev->bus_session);
-                /* Destroy existing pipes. */
-                usb_device_destroy_pipes(dev);
-                /* Ignore errors and hope for the best. */
-                usb_hc_connection_deinitialize(&dev->hc_conn);
-                usb_alternate_interfaces_deinit(&dev->alternate_interfaces);
-                usb_device_release_descriptors(dev);
-                free(dev->driver_data);
-                dev->driver_data = NULL;
-        }
-}
-
 int usb_device_create_ddf(ddf_dev_t *ddf_dev,
     const usb_endpoint_description_t **desc, const char **err)
@@ -514 +524 @@
         assert(ddf_dev);
         assert(err);
-        usb_device_t *dev = ddf_dev_data_alloc(ddf_dev, sizeof(usb_device_t));
-        if (dev == NULL) {
+        usb_device_t *usb_dev =
+            ddf_dev_data_alloc(ddf_dev, sizeof(usb_device_t));
+        if (usb_dev == NULL) {
                 *err = "DDF data alloc";
                 return ENOMEM;
         }
-        return usb_device_init(dev, ddf_dev, desc, err);
+        return usb_device_init(usb_dev, ddf_dev, desc, err, 0);
 }
 
@@ -525 +536 @@
 {
         assert(ddf_dev);
-        usb_device_t *dev = ddf_dev_data_get(ddf_dev);
-        assert(dev);
-        usb_device_fini(dev);
+        usb_device_t *usb_dev = ddf_dev_data_get(ddf_dev);
+        assert(usb_dev);
+        usb_device_fini(usb_dev);
         return;
+}
+
+usb_device_t * usb_device_create(devman_handle_t handle)
+{
+        usb_device_t *usb_dev = malloc(sizeof(usb_device_t));
+        if (!usb_dev)
+                return NULL;
+        const char* dummy = NULL;
+        const int ret = usb_device_init(usb_dev, NULL, NULL, &dummy, handle);
+        if (ret != EOK) {
+                free(usb_dev);
+                usb_dev = NULL;
+        }
+        return usb_dev;
+
+}
+
+void usb_device_destroy(usb_device_t *usb_dev)
+{
+        if (usb_dev) {
+                usb_device_fini(usb_dev);
+                free(usb_dev);
+        }
 }