Changeset 59c163c in mainline for uspace/lib/usbdev/src/hub.c

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.

File:

• uspace/lib/usbdev/src/hub.c (modified) (3 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;