Changeset d15809b4 in mainline for uspace/lib/usb/src/pipes.c

Timestamp:

2011-02-14T10:14:31Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

962ce100

Parents:

0d36c20 (diff), 45c01a1 (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

File:

• uspace/lib/usb/src/pipes.c (modified) (4 diffs)

uspace/lib/usb/src/pipes.c

@@ -123 +123 @@
  * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15).
  * @param transfer_type Transfer type (e.g. interrupt or bulk).
+ * @param max_packet_size Maximum packet size in bytes.
  * @param direction Endpoint direction (in/out).
  * @return Error code.
@@ -128 +129 @@
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *pipe,
     usb_device_connection_t *connection, usb_endpoint_t endpoint_no,
-    usb_transfer_type_t transfer_type, usb_direction_t direction)
+    usb_transfer_type_t transfer_type, size_t max_packet_size,
+    usb_direction_t direction)
 {
         assert(pipe);
@@ -137 +139 @@
         pipe->endpoint_no = endpoint_no;
         pipe->transfer_type = transfer_type;
+        pipe->max_packet_size = max_packet_size;
         pipe->direction = direction;
 
@@ -156 +159 @@
 
         int rc = usb_endpoint_pipe_initialize(pipe, connection,
-            0, USB_TRANSFER_CONTROL, USB_DIRECTION_BOTH);
+            0, USB_TRANSFER_CONTROL, 8, USB_DIRECTION_BOTH);
 
         return rc;