Changes in uspace/app/usbinfo/info.c [e387d0f:8373f53] in mainline

File:

• uspace/app/usbinfo/info.c (modified) (6 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"
 
@@ -120 +119 @@
     usb_standard_configuration_descriptor_t *descriptor)
 {
-        printf("%sConfiguration #%d (%zu interfaces, total %zuB)\n", prefix,
+        printf("%sConfiguration #%d (%zu interfaces)\n", prefix,
             (int) descriptor->configuration_number,
-            (size_t) descriptor->interface_count,
-            (size_t) descriptor->total_length);
+            (size_t) descriptor->interface_count);
 }
 
@@ -158 +156 @@
 }
 
-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);
-}
-
-
-static void dump_descriptor_tree_callback(uint8_t *descriptor,
+
+static void dump_descriptor_tree_brief_callback(uint8_t *descriptor,
     size_t depth, void *arg)
 {
@@ -183 +174 @@
                 if (descr_size >= sizeof(descriptor_type)) { \
                         callback(indent, (descriptor_type *) descriptor); \
-                        if (arg != NULL) { \
-                                usb_dump_standard_descriptor(stdout, \
-                                    get_indent(depth +2), "\n", \
-                                    descriptor, descr_size); \
-                        } \
                 } else { \
                         descr_type = -1; \
@@ -208 +194 @@
                     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:
@@ -227 +206 @@
 void dump_descriptor_tree_brief(usbinfo_device_t *dev)
 {
-        dump_descriptor_tree_callback((uint8_t *)&dev->device_descriptor,
+        dump_descriptor_tree_brief_callback((uint8_t *)&dev->device_descriptor,
             (size_t) -1, NULL);
         usb_dp_walk_simple(dev->full_configuration_descriptor,
             dev->full_configuration_descriptor_size,
             usb_dp_standard_descriptor_nesting,
-            dump_descriptor_tree_callback,
+            dump_descriptor_tree_brief_callback,
             NULL);
 }
-
-void dump_descriptor_tree_full(usbinfo_device_t *dev)
-{
-        dump_descriptor_tree_callback((uint8_t *)&dev->device_descriptor,
-            (size_t) -1, dev);
-        usb_dp_walk_simple(dev->full_configuration_descriptor,
-            dev->full_configuration_descriptor_size,
-            usb_dp_standard_descriptor_nesting,
-            dump_descriptor_tree_callback,
-            dev);
-}
-
 
 void dump_strings(usbinfo_device_t *dev)