Changeset b8cab5c in mainline for uspace/app/mkbd/main.c

Timestamp:

2011-05-27T07:10:12Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ffca03c

Parents:

8bb61e6 (diff), 1889786 (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/mkbd/main.c (modified) (2 diffs)

uspace/app/mkbd/main.c

@@ -45 +45 @@
 #include <devmap.h>
 #include <usb/dev/hub.h>
-#include <usb/host.h>
-#include <usb/driver.h>
+#include <usb/hc.h>
 #include <usb/dev/pipes.h>
 
@@ -173 +172 @@
                 /* Try to get its address. */
                 if (!addr_found) {
-                        addr = usb_device_get_assigned_address(dev_handle);
+                        addr = usb_hc_get_address_by_handle(dev_handle);
                         if (addr >= 0) {
                                 addr_found = true;