Changeset 7f70d1c in mainline

Timestamp:

2017-12-19T09:07:15Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

0bb4738

Parents:

32fb6bce

Message:

libusb: print also superspeed ep companion descriptor

Location:

uspace

Files:

• app/usbinfo/dump.c (modified) (1 diff)
• app/usbinfo/info.c (modified) (2 diffs)
• lib/usb/src/dump.c (modified) (3 diffs)
• lib/usbdev/src/dp.c (modified) (1 diff)

uspace/app/usbinfo/dump.c

@@ -61 +61 @@
                 INDENT INDENT INDENT,
                 INDENT INDENT INDENT INDENT,
-                INDENT INDENT INDENT INDENT INDENT
+                INDENT INDENT INDENT INDENT INDENT,
+                INDENT INDENT INDENT INDENT INDENT INDENT,
         };
         static size_t indents_count = sizeof(indents)/sizeof(indents[0]);

uspace/app/usbinfo/info.c

@@ -151 +151 @@
 }
 
+static void dump_descriptor_tree_brief_superspeed_endpoint_companion(const char *prefix,
+    usb_superspeed_endpoint_companion_descriptor_t *descriptor)
+{
+        printf("%sSuperspeed endpoint companion\n", prefix);
+}
+
 static void dump_descriptor_tree_brief_hid(const char *prefix,
     usb_standard_hid_descriptor_t *descriptor)
@@ -206 +212 @@
                     usb_standard_endpoint_descriptor_t,
                     dump_descriptor_tree_brief_endpoint);
+                _BRANCH(USB_DESCTYPE_SSPEED_EP_COMPANION,
+                    usb_superspeed_endpoint_companion_descriptor_t,
+                    dump_descriptor_tree_brief_superspeed_endpoint_companion);
                 _BRANCH(USB_DESCTYPE_HID,
                     usb_standard_hid_descriptor_t,

uspace/lib/usb/src/dump.c

@@ -61 +61 @@
 static void usb_dump_descriptor_endpoint(FILE *, const char *, const char *,
     const uint8_t *, size_t);
+static void usb_dump_descriptor_superspeed_endpoint_companion(FILE *, const char *, const char *,
+    const uint8_t *, size_t);
 static void usb_dump_descriptor_hid(FILE *, const char *, const char *,
     const uint8_t *, size_t);
@@ -75 +77 @@
         { USB_DESCTYPE_INTERFACE, usb_dump_descriptor_interface },
         { USB_DESCTYPE_ENDPOINT, usb_dump_descriptor_endpoint },
+        { USB_DESCTYPE_SSPEED_EP_COMPANION, usb_dump_descriptor_superspeed_endpoint_companion },
         { USB_DESCTYPE_HID, usb_dump_descriptor_hid },
         { USB_DESCTYPE_HUB, usb_dump_descriptor_hub },
@@ -238 +241 @@
         PRINTLINE("wMaxPacketSize = %d", d->max_packet_size);
         PRINTLINE("bInterval = %dms", d->poll_interval);
+}
+
+static void usb_dump_descriptor_superspeed_endpoint_companion(FILE *output,
+    const char *line_prefix, const char *line_suffix,
+    const uint8_t *descriptor, size_t descriptor_length)
+{
+        usb_superspeed_endpoint_companion_descriptor_t *d
+           = (usb_superspeed_endpoint_companion_descriptor_t *) descriptor;
+        if (descriptor_length < sizeof(*d)) {
+                return;
+        }
+
+        PRINTLINE("bLength = %u", d->length);
+        PRINTLINE("bDescriptorType = 0x%02X", d->descriptor_type);
+        PRINTLINE("bMaxBurst = %u", d->max_burst);
+        PRINTLINE("bmAttributes = %d", d->attributes);
+        PRINTLINE("wBytesPerInterval = %u", d->bytes_per_interval);
 }
 

uspace/lib/usbdev/src/dp.c

@@ -62 +62 @@
         NESTING(CONFIGURATION, INTERFACE),
         NESTING(INTERFACE, ENDPOINT),
+        NESTING(ENDPOINT, SSPEED_EP_COMPANION),
         NESTING(INTERFACE, HUB),
         NESTING(INTERFACE, HID),