Changeset aad3587 in mainline for uspace/app/usbinfo/main.c

Timestamp:

2011-03-17T23:10:26Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2d6787b

Parents:

7b13d8e

Message:

String printing back in usbinfo

File:

• uspace/app/usbinfo/main.c (modified) (6 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("-s --strings", "Try to print all string descriptors.");
 
         printf("\n");
@@ -148 +149 @@
         {"match-ids", no_argument, NULL, 'm'},
         {"descriptor-tree", no_argument, NULL, 't'},
+        {"strings", no_argument, NULL, 's'},
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himt";
+static const char *short_options = "himts";
 
 int main(int argc, char *argv[])
@@ -162 +164 @@
         bool action_print_match_ids = false;
         bool action_print_descriptor_tree = false;
+        bool action_print_strings = false;
 
         /*
@@ -189 +192 @@
                                 action_print_descriptor_tree = true;
                                 break;
+                        case 's':
+                                action_print_strings = true;
+                                break;
                         default:
                                 assert(false && "unreachable code");
@@ -198 +204 @@
         if (!action_print_match_ids
             && !action_print_short_identification
+            && !action_print_strings
             && !action_print_descriptor_tree) {
                 action_print_short_identification = true;
@@ -239 +246 @@
                         dump_descriptor_tree_brief(dev);
                 }
+                if (action_print_strings) {
+                        dump_strings(dev);
+                }
 
                 /* Destroy the control pipe (close the session etc.). */