Changeset 324fa1e in mainline for uspace/lib/usb/include

Timestamp:

2011-02-14T22:00:57Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8ab1ad4c

Parents:

78e3dc4 (diff), d4ee4e2 (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 development/ changes

Location:

uspace/lib/usb/include/usb

Files:

• pipes.h (modified) (1 diff)
• recognise.h (modified) (1 diff)

uspace/lib/usb/include/usb/pipes.h

@@ -139 +139 @@
     void *, size_t);
 
-
-
-int usb_endpoint_pipe_async_read(usb_endpoint_pipe_t *, void *, size_t,
-    size_t *, usb_handle_t *);
-int usb_endpoint_pipe_async_write(usb_endpoint_pipe_t *, void *, size_t,
-    usb_handle_t *);
-
-int usb_endpoint_pipe_async_control_read(usb_endpoint_pipe_t *, void *, size_t,
-    void *, size_t, size_t *, usb_handle_t *);
-int usb_endpoint_pipe_async_control_write(usb_endpoint_pipe_t *, void *, size_t,
-    void *, size_t, usb_handle_t *);
-
-int usb_endpoint_pipe_wait_for(usb_endpoint_pipe_t *, usb_handle_t);
-
 #endif
 /**

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

@@ -39 +39 @@
 #include <usb/usb.h>
 #include <usb/pipes.h>
+#include <ipc/devman.h>
 
 int usb_device_create_match_ids(usb_endpoint_pipe_t *, match_id_list_t *);