Changeset b4b534ac in mainline for uspace/lib/usbdev/include/usb/dev/recognise.h

Timestamp:

2016-07-22T08:24:47Z (9 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/lib/usbdev/include/usb/dev/recognise.h (modified) (2 diffs)

uspace/lib/usbdev/include/usb/dev/recognise.h

@@ -37 +37 @@
 #define LIBUSBDEV_RECOGNISE_H_
 
-#include <sys/types.h>
-#include <usb/usb.h>
+#include <usb/descriptor.h>
 #include <usb/dev/pipes.h>
-#include <ipc/devman.h>
+
+#include <devman.h>
 
 extern int usb_device_create_match_ids_from_device_descriptor(
@@ -50 +50 @@
 
 extern int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
-
-extern int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
-    ddf_dev_t *, ddf_fun_t *, ddf_dev_ops_t *);
-
 #endif