Changeset 6b433a8 in mainline for uspace/lib

Timestamp:

2017-11-20T19:14:31Z (8 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

27b0ea0

Parents:

d3086873

Message:

Isochronous transfers - endpoint initialization

Location:

uspace/lib

Files:

• drv/include/usb_iface.h (modified) (1 diff)
• usb/include/usb/descriptor.h (modified) (1 diff)
• usbdev/include/usb/dev/pipes.h (modified) (1 diff)
• usbdev/src/pipes.c (modified) (3 diffs)
• usbdev/src/pipesinit.c (modified) (2 diffs)

uspace/lib/drv/include/usb_iface.h

@@ -126 +126 @@
                 unsigned max_burst;
                 unsigned max_streams;
+                unsigned mult;
+                unsigned bytes_per_interval;
         } usb3;
 } usb_endpoint_desc_t;

uspace/lib/usb/include/usb/descriptor.h

@@ -240 +240 @@
          * For bulk endpoints, this field contains the amount of streams
          * supported by the endpoint.
-         * For isochronous endpoints, this field contains either maximum
-         * number of packets supported within a service interval, or
-         * whether an isochronous endpoint companion descriptor follows.
+         * For isochronous endpoints, this field contains maximum
+         * number of packets supported within a service interval.
+         * Warning: the values returned by macros may not make any sense
+         * for specific endpoint types.
          */
         uint8_t attributes;
 #define SS_COMPANION_MAX_STREAMS(attributes) \
         (attributes & 0x1f)
+#define SS_COMPANION_MULT(attributes) \
+        (attributes & 0x3)
         /** The total number of bytes this endpoint will transfer
          * every service interval (SI).

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

@@ -97 +97 @@
 
 int usb_pipe_initialize(usb_pipe_t *, usb_endpoint_t, usb_transfer_type_t,
-    size_t, usb_direction_t, unsigned, unsigned, unsigned, usb_dev_session_t *);
+    size_t, usb_direction_t, unsigned, unsigned, unsigned, unsigned, unsigned, usb_dev_session_t *);
 int usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
 

uspace/lib/usbdev/src/pipes.c

@@ -255 +255 @@
     usb_transfer_type_t transfer_type, size_t max_packet_size,
     usb_direction_t direction, unsigned packets,
-    unsigned max_burst, unsigned max_streams, usb_dev_session_t *bus_session)
-{
-        // FIXME refactor this function
+    unsigned max_burst, unsigned max_streams, unsigned bytes_per_interval,
+        unsigned mult, usb_dev_session_t *bus_session)
+{
+        // FIXME: refactor this function PLEASE
         assert(pipe);
 
@@ -267 +268 @@
         pipe->desc.usb3.max_burst = max_burst;
         pipe->desc.usb3.max_streams = max_streams;
+        pipe->desc.usb3.mult = mult;
+        pipe->desc.usb3.bytes_per_interval = bytes_per_interval;
         pipe->auto_reset_halt = false;
         pipe->bus_session = bus_session;
@@ -284 +287 @@
 
         const int rc = usb_pipe_initialize(pipe, 0, USB_TRANSFER_CONTROL,
-            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH, 1, 0, 0, bus_session);
+            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH, 1, 0, 0, 0, 0, bus_session);
 
         pipe->auto_reset_halt = true;

uspace/lib/usbdev/src/pipesinit.c

@@ -210 +210 @@
         unsigned max_burst = 0;
         unsigned max_streams = 0;
+        unsigned bytes_per_interval = 0;
+        unsigned mult = 0;
         if(companion_desc) {
                 max_burst = companion_desc->max_burst;
                 max_streams = SS_COMPANION_MAX_STREAMS(companion_desc->attributes);
-        }
-
+                bytes_per_interval = companion_desc->bytes_per_interval;
+                mult = SS_COMPANION_MULT(companion_desc->attributes);
+        }
+
+        // FIXME: USB2 packets and USB3 max_burst are probably the same thing
+        // See 4.14.2.1.1 of XHCI specification -> possibly refactor into one somehow-named field
         int rc = usb_pipe_initialize(&ep_mapping->pipe,
             ep_no, description.transfer_type,
@@ -221 +227 @@
             description.direction, ED_MPS_TRANS_OPPORTUNITIES_GET(
                 uint16_usb2host(endpoint_desc->max_packet_size)),
-            max_burst, max_streams, bus_session);
+            max_burst, max_streams, bytes_per_interval, mult, bus_session);
         if (rc != EOK) {
                 return rc;