Changeset 4e732f1a in mainline for uspace/lib/usbdev

Timestamp:

2014-01-24T02:10:16Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

42de21a

Parents:

3de7a62

Message:

usb: Add support for multiple packets per microframe.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/pipes.h (modified) (2 diffs)
• src/pipes.c (modified) (4 diffs)
• src/pipesinit.c (modified) (1 diff)

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

@@ -61 +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.
@@ -105 +109 @@
 
 int usb_pipe_initialize(usb_pipe_t *, usb_endpoint_t, usb_transfer_type_t,
-    size_t, usb_direction_t, usb_dev_session_t *);
+    size_t, usb_direction_t, unsigned, usb_dev_session_t *);
 int usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
 

uspace/lib/usbdev/src/pipes.c

@@ -254 +254 @@
 int usb_pipe_initialize(usb_pipe_t *pipe, usb_endpoint_t endpoint_no,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
-    usb_direction_t direction, usb_dev_session_t *bus_session)
+    usb_direction_t direction, unsigned packets, usb_dev_session_t *bus_session)
 {
         assert(pipe);
@@ -260 +260 @@
         pipe->endpoint_no = endpoint_no;
         pipe->transfer_type = transfer_type;
+        pipe->packets = packets;
         pipe->max_packet_size = max_packet_size;
         pipe->direction = direction;
@@ -279 +280 @@
 
         const int rc = usb_pipe_initialize(pipe, 0, USB_TRANSFER_CONTROL,
-            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH, bus_session);
+            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH, 1, bus_session);
 
         pipe->auto_reset_halt = true;
@@ -301 +302 @@
         const int ret = usb_register_endpoint(exch, pipe->endpoint_no,
             pipe->transfer_type, pipe->direction, pipe->max_packet_size,
-            interval);
+            pipe->packets, interval);
         async_exchange_end(exch);
         return ret;

uspace/lib/usbdev/src/pipesinit.c

@@ -196 +196 @@
         int rc = usb_pipe_initialize(&ep_mapping->pipe,
             ep_no, description.transfer_type,
-            uint16_usb2host(endpoint_desc->max_packet_size),
-            description.direction, bus_session);
+            ED_MPS_PACKET_SIZE_GET(
+                uint16_usb2host(endpoint_desc->max_packet_size)),
+            description.direction,
+            ED_MPS_TRANS_OPPORTUNITIES_GET(
+                uint16_usb2host(endpoint_desc->max_packet_size)), bus_session);
         if (rc != EOK) {
                 return rc;