Changeset c9d5577 in mainline

Timestamp:

2011-01-14T14:55:19Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ff8ed06

Parents:

4989d73

Message:

`usbinfo' dumps interface descriptor nicely

File:

• uspace/app/usbinfo/dump.c (modified) (4 diffs)

uspace/app/usbinfo/dump.c

@@ -43 +43 @@
 #include <usb/usb.h>
 #include <usb/descriptor.h>
+#include <usb/classes/classes.h>
 
 #include "usbinfo.h"
@@ -48 +49 @@
 
 #define INDENT "  "
-#define PRINTLINE(indent, fmt, ...) printf("%s" fmt, get_indent(indent), __VA_ARGS__)
+#define PRINTLINE(indent, fmt, ...) printf("%s - " fmt, get_indent(indent), __VA_ARGS__)
 #define BYTES_PER_LINE 12
 
@@ -200 +201 @@
 void dump_descriptor_interface(size_t indent, uint8_t *descr, size_t size)
 {
-        dump_descriptor_generic(indent, descr, size);
+        usb_standard_interface_descriptor_t *d
+            = (usb_standard_interface_descriptor_t *) descr;
+        if (size != sizeof(*d)) {
+                return;
+        }
+        
+        PRINTLINE(indent, "bLength = %d\n", d->length);
+        PRINTLINE(indent, "bDescriptorType = 0x%02x\n", d->descriptor_type);
+        PRINTLINE(indent, "bInterfaceNumber = %d\n", d->interface_number);
+        PRINTLINE(indent, "bAlternateSetting = %d\n", d->alternate_setting);
+        PRINTLINE(indent, "bNumEndpoints = %d\n", d->endpoint_count);
+        PRINTLINE(indent, "bInterfaceClass = %s\n", d->interface_class == 0
+            ? "reserved (0)" : usb_str_class(d->interface_class));
+        PRINTLINE(indent, "bInterfaceSubClass = %d\n", d->interface_subclass);
+        PRINTLINE(indent, "bInterfaceProtocol = %d\n", d->interface_protocol);
+        PRINTLINE(indent, "iInterface = %d\n", d->str_interface);
 }
 
@@ -212 +228 @@
         usb_standard_endpoint_descriptor_t *d
            = (usb_standard_endpoint_descriptor_t *) descr;
+        if (size != sizeof(*d)) {
+                return;
+        }
         
         int endpoint = d->endpoint_address & 15;