Changeset 59c163c in mainline

Timestamp:

2011-10-31T11:49:15Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1e6dc5b

Parents:

90d7033

Message:

libusbdev: Automatically create attached device info for new devices.

Location:

uspace/lib/usbdev/src

Files:

• hub.c (modified) (3 diffs)
• recognise.c (modified) (5 diffs)

uspace/lib/usbdev/src/hub.c

@@ -179 +179 @@
  * @param[in] dev_ops Child device ops. Will use default if not provided.
  * @param[in] new_dev_data Arbitrary pointer to be stored in the child
- *      as @c driver_data.
+ *      as @c driver_data. Will allocate and assign usb_hub_attached_device_t
+ *      structure if NULL.
  * @param[out] new_fun Storage where pointer to allocated child function
  *      will be written. Must be non-null.
@@ -219 +220 @@
         }
 
-
         /*
          * Request new address.
@@ -328 +328 @@
         }
 
-        /*
-         * And now inform the host controller about the handle.
-         */
         const usb_hub_attached_device_t new_device = {
                 .address = dev_addr,
                 .fun = child_fun,
         };
+
+
+        /*
+         * And now inform the host controller about the handle.
+         */
         rc = usb_hc_register_device(&hc_conn, &new_device);
         if (rc != EOK) {
+                /* We know nothing about that data. */
+                if (new_dev_data)
+                        child_fun->driver_data = NULL;
                 /* The child function is already created. */
-                child_fun->driver_data = NULL;
                 ddf_fun_destroy(child_fun);
                 rc = EDESTADDRREQ;

uspace/lib/usbdev/src/recognise.c

@@ -35 +35 @@
 #include <sys/types.h>
 #include <fibril_synch.h>
+#include <usb/debug.h>
+#include <usb/dev/hub.h>
 #include <usb/dev/pipes.h>
 #include <usb/dev/recognise.h>
@@ -353 +355 @@
                 return EINVAL;
 
+        if (!dev_ops && dev_data) {
+                usb_log_warning("Using standard fun ops with arbitrary "
+                    "driver data. This does not have to work.\n");
+        }
+
         size_t this_device_name_index;
 
@@ -366 +373 @@
         usb_pipe_t ctrl_pipe;
 
-        rc = usb_device_connection_initialize(&dev_connection, hc_handle, address);
-        if (rc != EOK) {
-                goto failure;
-        }
-
-        rc = usb_pipe_initialize_default_control(&ctrl_pipe,
-            &dev_connection);
+        rc = usb_device_connection_initialize(
+            &dev_connection, hc_handle, address);
+        if (rc != EOK) {
+                goto failure;
+        }
+
+        rc = usb_pipe_initialize_default_control(&ctrl_pipe, &dev_connection);
         if (rc != EOK) {
                 goto failure;
@@ -405 +412 @@
 
         child->driver_data = dev_data;
+        /* Store the attached device in fun driver data if there is no
+         * other data */
+        if (!dev_data) {
+                usb_hub_attached_device_t *new_device = ddf_fun_data_alloc(
+                    child, sizeof(usb_hub_attached_device_t));
+                if (!new_device) {
+                        rc = ENOMEM;
+                        goto failure;
+                }
+                new_device->address = address;
+                new_device->fun = child;
+        }
+
 
         rc = usb_device_create_match_ids(&ctrl_pipe, &child->match_ids);
@@ -421 +441 @@
 failure:
         if (child != NULL) {
-                /* This was not malloced by us, does not even have to be
-                 * on heap. */
-                child->driver_data = NULL;
+                /* We know nothing about the data if it came from outside. */
+                if (dev_data) {
+                        child->driver_data = NULL;
+                }
                 /* This takes care of match_id deallocation as well. */
                 ddf_fun_destroy(child);