Changeset eece178 in mainline

Timestamp:

2011-03-21T11:30:14Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e387d0f

Parents:

57abafd

Message:

Add dumper for hub descriptor to usbinfo

It will probably not be called at all but it won't hurt.

File:

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

uspace/app/usbinfo/info.c

@@ -42 +42 @@
 #include <usb/classes/classes.h>
 #include <usb/classes/hid.h>
+#include <usb/classes/hub.h>
 #include "usbinfo.h"
 
@@ -119 +120 @@
     usb_standard_configuration_descriptor_t *descriptor)
 {
-        printf("%sConfiguration #%d (%zu interfaces)\n", prefix,
+        printf("%sConfiguration #%d (%zu interfaces, total %zuB)\n", prefix,
             (int) descriptor->configuration_number,
-            (size_t) descriptor->interface_count);
+            (size_t) descriptor->interface_count,
+            (size_t) descriptor->total_length);
 }
 
@@ -154 +156 @@
             (int) descriptor->country_code,
             (int) descriptor->class_desc_count);
+}
+
+static void dump_descriptor_tree_brief_hub(const char *prefix,
+    usb_hub_descriptor_header_t *descriptor)
+{
+        printf("%shub (%d ports)\n", prefix,
+            (int) descriptor->port_count);
 }
 
@@ -194 +203 @@
                     usb_standard_hid_descriptor_t,
                     dump_descriptor_tree_brief_hid);
+                /*
+                 * Probably useless, hub descriptor shall not be part of
+                 * configuration descriptor.
+                 */
+                _BRANCH(USB_DESCTYPE_HUB,
+                    usb_hub_descriptor_header_t,
+                    dump_descriptor_tree_brief_hub);
 
                 default: