Changeset b4b534ac in mainline for uspace/lib/usbdev/include/usb/dev/pipes.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/pipes.h (modified) (4 diffs)

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

@@ -35 +35 @@
 #define LIBUSBDEV_PIPES_H_
 
-#include <sys/types.h>
-#include <ipc/devman.h>
-#include <ddf/driver.h>
-#include <fibril_synch.h>
 #include <usb/usb.h>
 #include <usb/descriptor.h>
-#include <usb/dev/usb_device_connection.h>
+#include <usb_iface.h>
+
+#include <stdbool.h>
+#include <sys/types.h>
 
 #define CTRL_PIPE_MIN_PACKET_SIZE 8
@@ -50 +49 @@
  */
 typedef struct {
-        /** The connection used for sending the data. */
-        usb_device_connection_t *wire;
-
         /** Endpoint number. */
         usb_endpoint_t endpoint_no;
@@ -65 +61 @@
         size_t max_packet_size;
 
+        /** Number of packets per frame/uframe.
+         * Only valid for HS INT and ISO transfers. All others should set to 1*/
+        unsigned packets;
+
         /** Whether to automatically reset halt on the endpoint.
          * Valid only for control endpoint zero.
          */
         bool auto_reset_halt;
+
+        /** The connection used for sending the data. */
+        usb_dev_session_t *bus_session;
 } usb_pipe_t;
 
@@ -105 +108 @@
 } usb_endpoint_mapping_t;
 
-int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *,
-    usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t);
-int usb_pipe_initialize_default_control(usb_pipe_t *,
-    usb_device_connection_t *);
+int usb_pipe_initialize(usb_pipe_t *, usb_endpoint_t, usb_transfer_type_t,
+    size_t, usb_direction_t, unsigned, usb_dev_session_t *);
+int usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
 
 int usb_pipe_probe_default_control(usb_pipe_t *);
 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
-    size_t, const uint8_t *, size_t, usb_device_connection_t *);
+    size_t, const uint8_t *, size_t, usb_dev_session_t *);
 
 int usb_pipe_register(usb_pipe_t *, unsigned);
 int usb_pipe_unregister(usb_pipe_t *);
-
-int usb_pipe_start_long_transfer(usb_pipe_t *);
-int usb_pipe_end_long_transfer(usb_pipe_t *);
 
 int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);