Changeset 62f4212 in mainline for uspace/app/usbinfo/main.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged changes from development

File:

• uspace/app/usbinfo/main.c (modified) (3 diffs)

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
         },