Changeset f8e1a2c in mainline for uspace/lib

Timestamp:

2011-03-21T13:19:19Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0e45e7f, 8a951ca

Parents:

e387d0f (diff), 2e1d5d70 (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 development/ changes

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/host/batch.h (added)
• include/usb/host/device_keeper.h (moved) (moved from uspace/drv/uhci-hcd/utils/device_keeper.h ) (2 diffs)
• src/host/batch.c (added)
• src/host/device_keeper.c (moved) (moved from uspace/drv/uhci-hcd/utils/device_keeper.c ) (2 diffs)
• src/pipes.c (modified) (2 diffs)

uspace/lib/usb/Makefile

@@ -49 +49 @@
         src/request.c \
         src/usb.c \
-        src/usbdevice.c
+        src/usbdevice.c \
+        src/host/device_keeper.c \
+        src/host/batch.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usb/include/usb/host/device_keeper.h

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbuhcihc
+/** @addtogroup libusb
  * @{
  */
@@ -33 +33 @@
  * @brief UHCI driver
  */
-#ifndef UTILS_DEVICE_KEEPER_H
-#define UTILS_DEVICE_KEEPER_H
+#ifndef LIBUSB_HOST_DEVICE_KEEPER_H
+#define LIBUSB_HOST_DEVICE_KEEPER_H
 #include <devman.h>
 #include <fibril_synch.h>

uspace/lib/usb/src/host/device_keeper.c

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbuhcihc
+/** @addtogroup libusb
  * @{
  */
@@ -36 +36 @@
 #include <errno.h>
 #include <usb/debug.h>
-
-#include "device_keeper.h"
+#include <usb/host/device_keeper.h>
 
 /*----------------------------------------------------------------------------*/

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,