Changeset 79c8a96 in mainline for uspace/lib/usb/src

Timestamp:

2011-03-21T10:27:44Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2e1d5d70, c15070c

Parents:

81dce9f (diff), f0fdc7d (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:

Development branch changes

Location:

uspace/lib/usb/src

Files:

• devdrv.c (modified) (2 diffs)
• pipes.c (modified) (2 diffs)
• recognise.c (modified) (2 diffs)

uspace/lib/usb/src/devdrv.c

@@ -206 +206 @@
  * @return Error code.
  */
-static int initialize_pipes(usb_driver_t *drv, usb_device_t *dev)
+static int initialize_pipes(usb_device_t *dev)
 {
         int rc;
@@ -284 +284 @@
         dev->driver_data = NULL;
 
-        rc = initialize_pipes(driver, dev);
+        rc = initialize_pipes(dev);
         if (rc != EOK) {
                 free(dev);

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,

uspace/lib/usb/src/recognise.c

@@ -247 +247 @@
 #undef VENDOR_ONLY_FMT
 #undef VENDOR_ONLY_ARGS
+
+        /* As a last resort, try fallback driver. */
+        ADD_MATCHID_OR_RETURN(matches, 10, "usb&interface&fallback");
 
         return EOK;
@@ -291 +294 @@
         }
         
+        /* As a last resort, try fallback driver. */
+        ADD_MATCHID_OR_RETURN(matches, 10, "usb&fallback");
+
         return EOK;
 }