Changeset 4a7a8d4 in mainline for uspace/app/usbinfo/main.c

Timestamp:

2011-05-13T10:31:54Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

aca3489

Parents:

05e21ffc (diff), c372e03 (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 usb/development

File:

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

uspace/app/usbinfo/main.c

@@ -46 +46 @@
 #include <usb/pipes.h>
 #include <usb/host.h>
+#include <usb/driver.h>
 #include "usbinfo.h"
 
@@ -308 +309 @@
                 }
 
-                usbinfo_device_t *dev = prepare_device(hc_handle, dev_addr);
+                usbinfo_device_t *dev = prepare_device(devpath,
+                    hc_handle, dev_addr);
                 if (dev == NULL) {
                         continue;