Changeset 62f4212 in mainline for uspace/lib/usb/src/pipes.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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:

Merged changes from development

File:

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

uspace/lib/usb/src/pipes.c

@@ -42 +42 @@
 #include <assert.h>
 
+#define IPC_AGAIN_DELAY (1000 * 2) /* 2ms */
+
 /** Tell USB address assigned to given device.
  *
@@ -150 +152 @@
         }
 
-        my_address = get_my_address(parent_phone, dev);
-        if (my_address < 0) {
-                rc = my_address;
-                goto leave;
-        }
+        /*
+         * Asking for "my" address may require several attempts.
+         * That is because following scenario may happen:
+         *  - parent driver (i.e. driver of parent device) announces new device
+         *    and devman launches current driver
+         *  - parent driver is preempted and thus does not send address-handle
+         *    binding to HC driver
+         *  - this driver gets here and wants the binding
+         *  - the HC does not know the binding yet and thus it answers ENOENT
+         *  So, we need to wait for the HC to learn the binding.
+         */
+        do {
+                my_address = get_my_address(parent_phone, dev);
+
+                if (my_address == ENOENT) {
+                        /* Be nice, let other fibrils run and try again. */
+                        async_usleep(IPC_AGAIN_DELAY);
+                } else if (my_address < 0) {
+                        /* Some other problem, no sense trying again. */
+                        rc = my_address;
+                        goto leave;
+                }
+
+        } while (my_address < 0);
 
         rc = usb_device_connection_initialize(connection,
@@ -212 +233 @@
  * A session is something inside what any communication occurs.
  * It is expected that sessions would be started right before the transfer
- * and ended - see usb_endpoint_pipe_end_session() - after the last
+ * and ended - see usb_pipe_end_session() - after the last
  * transfer.
  * The reason for this is that session actually opens some communication
@@ -223 +244 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *pipe)
+int usb_pipe_start_session(usb_pipe_t *pipe)
 {
         assert(pipe);
 
-        if (usb_endpoint_pipe_is_session_started(pipe)) {
+        if (usb_pipe_is_session_started(pipe)) {
                 return EBUSY;
         }
@@ -244 +265 @@
 /** Ends a session on the endpoint pipe.
  *
- * @see usb_endpoint_pipe_start_session
+ * @see usb_pipe_start_session
  *
  * @param pipe Endpoint pipe to end the session on.
  * @return Error code.
  */
-int usb_endpoint_pipe_end_session(usb_endpoint_pipe_t *pipe)
+int usb_pipe_end_session(usb_pipe_t *pipe)
 {
         assert(pipe);
 
-        if (!usb_endpoint_pipe_is_session_started(pipe)) {
+        if (!usb_pipe_is_session_started(pipe)) {
                 return ENOENT;
         }
@@ -275 +296 @@
  * @return Whether @p pipe has opened a session.
  */
-bool usb_endpoint_pipe_is_session_started(usb_endpoint_pipe_t *pipe)
+bool usb_pipe_is_session_started(usb_pipe_t *pipe)
 {
         return (pipe->hc_phone >= 0);