Changeset 062165f in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2011-10-31T16:15:54Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f37eb84

Parents:

1b17e37

Message:

libusbdev: Ask for default address before registering endpoint 0.

File:

• uspace/lib/usbdev/src/hub.c (modified) (1 diff)

uspace/lib/usbdev/src/hub.c

@@ -254 +254 @@
 
         do {
-                rc = usb_pipe_register_with_speed(&ctrl_pipe, dev_speed, 0,
-                    &hc_conn);
-                if (rc != EOK) {
+                rc = usb_hc_request_address(&hc_conn, USB_ADDRESS_DEFAULT,
+                    true, dev_speed);
+                if (rc != USB_ADDRESS_DEFAULT) {
                         /* Do not overheat the CPU ;-). */
                         async_usleep(ENDPOINT_0_0_REGISTER_ATTEMPT_DELAY_USEC);
                 }
-        } while (rc != EOK);
+        } while (rc == ENOENT);
+        if (rc != EOK) {
+                goto leave_release_free_address;
+        }
+
+        rc = usb_pipe_register_with_speed(&ctrl_pipe, dev_speed, 0, &hc_conn);
+        if (rc != EOK) {
+                rc = ENOTCONN;
+                goto leave_release_default_address;
+        }
+
         struct timeval end_time;