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

Timestamp:

2011-03-25T16:22:14Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

da3dafc, e6223239

Parents:

d8421c4 (diff), f08c560 (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:

merge from development

File:

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

uspace/app/usbinfo/main.c

@@ -136 +136 @@
         _OPTION("-T --descriptor-tree-full", "Print detailed descriptor tree");
         _OPTION("-s --strings", "Try to print all string descriptors.");
+        _OPTION("-S --status", "Get status of the device.");
 
         printf("\n");
@@ -152 +153 @@
         {"descriptor-tree-full", no_argument, NULL, 'T'},
         {"strings", no_argument, NULL, 's'},
+        {"status", no_argument, NULL, 'S'},
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himtTs";
+static const char *short_options = "himtTsS";
 
 static usbinfo_action_t actions[] = {
@@ -180 +182 @@
                 .opt = 's',
                 .action = dump_strings,
+                .active = false
+        },
+        {
+                .opt = 'S',
+                .action = dump_status,
                 .active = false
         },