Changeset 72af8da in mainline for uspace/lib/usb/src/hub.c

Timestamp:

2011-03-16T18:50:17Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

42a3a57

Parents:

3e7b7cd (diff), fcf07e6 (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 from usb/development

File:

• uspace/lib/usb/src/hub.c (modified) (6 diffs)

uspace/lib/usb/src/hub.c

@@ -57 +57 @@
  *
  * @param connection Opened connection to host controller.
+ * @param speed Speed of the device that will respond on the default address.
  * @return Error code.
  */
@@ -86 +87 @@
  *
  * @param connection Opened connection to host controller.
+ * @param speed Speed of the new device (device that will be assigned
+ *    the returned address).
  * @return Assigned USB address or negative error code.
  */
@@ -144 +147 @@
 /** Wrapper for registering attached device to the hub.
  *
- * The @p enable_port function is expected to enable singalling on given
+ * The @p enable_port function is expected to enable signaling on given
  * port.
  * The two arguments to it can have arbitrary meaning
@@ -152 +155 @@
  *
  * If the @p enable_port fails (i.e. does not return EOK), the device
- * addition is cancelled.
+ * addition is canceled.
  * The return value is then returned (it is good idea to use different
  * error codes than those listed as return codes by this function itself).
  *
- * @param parent Parent device (i.e. the hub device).
- * @param connection Opened connection to host controller.
- * @param dev_speed New device speed.
- * @param enable_port Function for enabling signalling through the port the
+ * @param[in] parent Parent device (i.e. the hub device).
+ * @param[in] connection Opened connection to host controller.
+ * @param[in] dev_speed New device speed.
+ * @param[in] enable_port Function for enabling signaling through the port the
  *      device is attached to.
- * @param port_no Port number (passed through to @p enable_port).
- * @param arg Any data argument to @p enable_port.
+ * @param[in] port_no Port number (passed through to @p enable_port).
+ * @param[in] arg Any data argument to @p enable_port.
  * @param[out] assigned_address USB address of the device.
  * @param[out] assigned_handle Devman handle of the new device.
+ * @param[in] dev_ops Child device ops.
+ * @param[in] new_dev_data Arbitrary pointer to be stored in the child
+ *      as @c driver_data.
+ * @param[out] new_fun Storage where pointer to allocated child function
+ *      will be written.
  * @return Error code.
  * @retval ENOENT Connection to HC not opened.
@@ -201 +209 @@
 
         /*
-         * Enable the port (i.e. allow signalling through this port).
+         * Enable the port (i.e. allow signaling through this port).
          */
         rc = enable_port(port_no, arg);
@@ -223 +231 @@
         rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe,
             &dev_conn);
+        if (rc != EOK) {
+                rc = ENOTCONN;
+                goto leave_release_default_address;
+        }
+        rc = usb_endpoint_pipe_probe_default_control(&ctrl_pipe);
         if (rc != EOK) {
                 rc = ENOTCONN;