Changeset 7943c43 in mainline for uspace/app/usbinfo/dev.c

Timestamp:

2012-01-16T22:45:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 mainline changes.

File:

• uspace/app/usbinfo/dev.c (modified) (2 diffs)

uspace/app/usbinfo/dev.c

@@ -34 +34 @@
  * Representation of queried device.
  */
-#include <usb/dev/pipes.h>
+#include <usb/dev.h>
+#include <usb/hc.h>
 #include <errno.h>
 #include <str_error.h>
@@ -52 +53 @@
         bool transfer_started = false;
 
-        rc = usb_device_connection_initialize(&dev->wire, hc_handle, dev_addr);
+        usb_hc_connection_initialize(&dev->hc_conn, hc_handle);
+
+        rc = usb_device_connection_initialize(
+            &dev->wire, &dev->hc_conn, dev_addr);
         if (rc != EOK) {
                 fprintf(stderr,