Changeset 25971d2 in mainline

Timestamp:

2011-02-06T22:55:30Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

79d2987

Parents:

cd50486

Message:

Endpoint pipes has maximum packet size

Location:

uspace

Files:

• drv/usbhid/main.c (modified) (1 diff)
• lib/usb/include/usb/pipes.h (modified) (2 diffs)
• lib/usb/src/pipes.c (modified) (4 diffs)
• lib/usb/src/pipesinit.c (modified) (1 diff)

uspace/drv/usbhid/main.c

@@ -426 +426 @@
          */
         rc = usb_endpoint_pipe_initialize(&kbd_dev->poll_pipe, &kbd_dev->wire,
-            GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, USB_DIRECTION_IN);
+            GUESSED_POLL_ENDPOINT, USB_TRANSFER_INTERRUPT, 8, USB_DIRECTION_IN);
         if (rc != EOK) {
                 printf("Failed to initialize interrupt in pipe: %s.\n",

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

@@ -74 +74 @@
         usb_direction_t direction;
 
+        /** Maximum packet size for the endpoint. */
+        size_t max_packet_size;
+
         /** Phone to the host controller.
          * Negative when no session is active.
@@ -118 +121 @@
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,
     usb_device_connection_t *,
-    usb_endpoint_t, usb_transfer_type_t, usb_direction_t);
+    usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t);
 int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *,
     usb_device_connection_t *);

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;

uspace/lib/usb/src/pipesinit.c

@@ -182 +182 @@
 
         int rc = usb_endpoint_pipe_initialize(ep_mapping->pipe, wire,
-            ep_no, description.transfer_type, description.direction);
+            ep_no, description.transfer_type, endpoint->max_packet_size,
+            description.direction);
         if (rc != EOK) {
                 return rc;