Changeset e387d0f in mainline

Timestamp:

2011-03-21T12:04:12Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f8e1a2c

Parents:

eece178

Message:

Add back full descriptor dump to usbinfo

Location:

uspace/app/usbinfo

Files:

• info.c (modified) (3 diffs)
• main.c (modified) (3 diffs)
• usbinfo.h (modified) (1 diff)

uspace/app/usbinfo/info.c

@@ -166 +166 @@
 
 
-static void dump_descriptor_tree_brief_callback(uint8_t *descriptor,
+static void dump_descriptor_tree_callback(uint8_t *descriptor,
     size_t depth, void *arg)
 {
@@ -183 +183 @@
                 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; \
@@ -222 +227 @@
 void dump_descriptor_tree_brief(usbinfo_device_t *dev)
 {
-        dump_descriptor_tree_brief_callback((uint8_t *)&dev->device_descriptor,
+        dump_descriptor_tree_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_brief_callback,
+            dump_descriptor_tree_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)

uspace/app/usbinfo/main.c

@@ -134 +134 @@
         _OPTION("-m --match-ids", "Print match ids generated for the device.");
         _OPTION("-t --descriptor-tree", "Print descriptor tree.");
+        _OPTION("-T --descriptor-tree-full", "Print detailed descriptor tree");
         _OPTION("-s --strings", "Try to print all string descriptors.");
 
@@ -149 +150 @@
         {"match-ids", no_argument, NULL, 'm'},
         {"descriptor-tree", no_argument, NULL, 't'},
+        {"descriptor-tree-full", no_argument, NULL, 'T'},
         {"strings", no_argument, NULL, 's'},
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himts";
+static const char *short_options = "himtTs";
 
 static usbinfo_action_t actions[] = {
@@ -168 +170 @@
                 .opt = 't',
                 .action = dump_descriptor_tree_brief,
+                .active = false
+        },
+        {
+                .opt = 'T',
+                .action = dump_descriptor_tree_full,
                 .active = false
         },

uspace/app/usbinfo/usbinfo.h

@@ -82 +82 @@
 void dump_device_match_ids(usbinfo_device_t *);
 void dump_descriptor_tree_brief(usbinfo_device_t *);
+void dump_descriptor_tree_full(usbinfo_device_t *);
 void dump_strings(usbinfo_device_t *);