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

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

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

uspace/app/mkbd/main.c

@@ -44 +44 @@
 #include <devman.h>
 #include <loc.h>
-#include <usb/dev/hub.h>
 #include <usbhid_iface.h>
 #include <usb/dev/pipes.h>
@@ -219 +218 @@
         devman_handle_t dev_handle = 0;
         
-        int rc = usb_resolve_device_handle(devpath, NULL, NULL, &dev_handle);
+        int rc = usb_resolve_device_handle(devpath, &dev_handle);
         if (rc != EOK) {
                 printf("Device not found or not of USB kind: %s.\n",