Changeset 1dd264b in mainline

Timestamp:

2010-12-03T13:27:39Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2cb6571

Parents:

4570779 (diff), 62c9661 (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 vojtechhorky/

Location:

uspace/lib/usb

Files:

• include/usb/hcdhubd.h (modified) (1 diff)
• src/localdrv.c (modified) (1 diff)
• src/usbdrv.c (modified) (1 diff)

uspace/lib/usb/include/usb/hcdhubd.h

@@ -154 +154 @@
  */
 
+device_t *usb_hc_connect(device_t *);
 
 int usb_hc_async_interrupt_out(usb_hc_device_t *, usb_target_t,

uspace/lib/usb/src/localdrv.c

@@ -39 +39 @@
 #include <errno.h>
 
+/** Find host controller when handled by current task.
+ *
+ * @param dev Device asking for connection.
+ * @return Device structure corresponding to parent host controller.
+ * @retval NULL Corresponding host controller not found.
+ */
+device_t *usb_hc_connect(device_t *dev)
+{
+        /*
+         * FIXME: this will not work when some hub on the path is
+         * not driven by the same task.
+         */
+        device_t *parent = dev;
+        while (parent->parent != NULL) {
+                parent = parent->parent;
+        }
+        
+        if (dev == parent) {
+                printf("FIXME in %s:%d encountered!\n", __FILE__, __LINE__);
+                parent = NULL;
+        }
+
+        return parent;
+}
+
 /** Information about pending transaction on HC. */
 typedef struct {

uspace/lib/usb/src/usbdrv.c

@@ -55 +55 @@
 /** Connect to host controller the device is physically attached to.
  *
- * @param handle Device handle.
+ * @param dev Device asking for connection.
  * @param flags Connection flags (blocking connection).
  * @return Phone to corresponding HC or error code.