Changeset ec700c7 in mainline for uspace/lib/usbdev/src/pipesinit.c

Timestamp:

2017-10-23T23:17:14Z (8 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

894f58c

Parents:

b724494

Message:

Superspeed companion descriptor is processed

Superspeed endpoint companion is now correctly read and processed while parsing descriptors.
As a side effect, mass storage endpoints now initialize correctly and therefore mass storage driver starts.

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (9 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -38 +38 @@
 #include <usb/dev/request.h>
 #include <usb/usb.h>
+#include <usb/debug.h>
 #include <usb/descriptor.h>
 
@@ -59 +60 @@
         NESTING(INTERFACE, HID),
         NESTING(HID, HID_REPORT),
+        NESTING(ENDPOINT, SSPEED_EP_COMPANION),
         LAST_NESTING
 };
@@ -70 +72 @@
 {
         return descriptor[1] == USB_DESCTYPE_ENDPOINT;
+}
+
+/** Tells whether given descriptor is of superspeed companion type.
+ *
+ * @param descriptor Descriptor in question.
+ * @return Whether the given descriptor is superspeed companion descriptor.
+ */
+static inline bool is_superspeed_companion_descriptor(const uint8_t *descriptor)
+{
+        return descriptor[1] == USB_DESCTYPE_SSPEED_EP_COMPANION;
 }
 
@@ -150 +162 @@
  * @param interface Interface descriptor under which belongs the @p endpoint.
  * @param endpoint Endpoint descriptor.
+ * @param companion Superspeed companion descriptor.
  * @return Error code.
  */
@@ -156 +169 @@
     usb_standard_interface_descriptor_t *interface,
     usb_standard_endpoint_descriptor_t *endpoint_desc,
+    usb_superspeed_endpoint_companion_descriptor_t *companion_desc,
     usb_dev_session_t *bus_session)
 {
@@ -194 +208 @@
         }
 
+        unsigned max_burst = 0;
+        unsigned max_streams = 0;
+        if(companion_desc) {
+                max_burst = companion_desc->max_burst;
+                max_streams = SS_COMPANION_MAX_STREAMS(companion_desc->attributes);
+        }
+
         int rc = usb_pipe_initialize(&ep_mapping->pipe,
             ep_no, description.transfer_type,
             ED_MPS_PACKET_SIZE_GET(
                 uint16_usb2host(endpoint_desc->max_packet_size)),
-            description.direction,
+            description.direction, max_burst, max_streams,
             ED_MPS_TRANS_OPPORTUNITIES_GET(
                 uint16_usb2host(endpoint_desc->max_packet_size)), bus_session);
@@ -207 +228 @@
         ep_mapping->present = true;
         ep_mapping->descriptor = endpoint_desc;
+        ep_mapping->companion_descriptor = companion_desc;
         ep_mapping->interface = interface;
 
@@ -235 +257 @@
         do {
                 if (is_endpoint_descriptor(descriptor)) {
+                        /* Check if companion descriptor is present too, it should immediatelly follow. */
+                        const uint8_t *companion_desc = usb_dp_get_nested_descriptor(parser,
+                                parser_data, descriptor);
+                        if (companion_desc && !is_superspeed_companion_descriptor(companion_desc)) {
+                                /* Not what we wanted, don't pass it further. */
+                                companion_desc = NULL;
+                        }
+
                         (void) process_endpoint(mapping, mapping_count,
                             (usb_standard_interface_descriptor_t *)
@@ -240 +270 @@
                             (usb_standard_endpoint_descriptor_t *)
                                 descriptor,
+                            (usb_superspeed_endpoint_companion_descriptor_t *)
+                                companion_desc,
                             bus_session);
                 }