Changeset 361e61b in mainline for uspace/lib/usb/src/pipes.c

Timestamp:

2011-03-21T14:23:15Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

55e388a1

Parents:

c32688d (diff), 48fe0c9 (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 with development

File:

• uspace/lib/usb/src/pipes.c (modified) (4 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.
  *
@@ -51 +53 @@
 {
         sysarg_t address;
-
 
         /*
@@ -96 +97 @@
 }
 
+/** Tell USB address assigned to given device.
+ *
+ * @param dev_handle Devman handle of the USB device in question.
+ * @return USB address or negative error code.
+ */
+usb_address_t usb_device_get_assigned_address(devman_handle_t dev_handle)
+{
+        int parent_phone = devman_parent_device_connect(dev_handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
+        sysarg_t address;
+
+        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_ADDRESS,
+            dev_handle, &address);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        async_hangup(parent_phone);
+
+        return (usb_address_t) address;
+}
+
 /** Initialize connection to USB device.
  *
@@ -123 +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,