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

Timestamp:

2011-03-17T21:11:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

da77278

Parents:

81ca204

Message:

Add printing of descriptor tree to usbinfo

File:

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

uspace/app/usbinfo/main.c

@@ -47 +47 @@
 #include "usbinfo.h"
 
-static void print_usage(char *app_name)
-{
-#define INDENT "      "
-        printf(NAME ": query USB devices for descriptors\n\n");
-        printf("Usage: %s [options] device [device [device [ ... ]]]\n",
-            app_name);
-        printf(INDENT "The device is a devman path to the device.\n");
-        printf("\n");
-#undef INDENT
-}
-
 static bool resolve_hc_handle_and_dev_addr(const char *devpath,
     devman_handle_t *out_hc_handle, usb_address_t *out_device_address)
@@ -130 +119 @@
 }
 
+static void print_usage(char *app_name)
+{
+#define _INDENT "      "
+#define _OPTION(opt, description) \
+        printf(_INDENT opt "\n" _INDENT _INDENT description "\n")
+
+        printf(NAME ": query USB devices for descriptors\n\n");
+        printf("Usage: %s [options] device [device [device [ ... ]]]\n",
+            app_name);
+        printf(_INDENT "The device is a devman path to the device.\n");
+
+        _OPTION("-h --help", "Print this help and exit.");
+        _OPTION("-i --identification", "Brief device identification.");
+        _OPTION("-m --match-ids", "Print match ids generated for the device.");
+        _OPTION("-t --descriptor-tree", "Print descriptor tree.");
+
+        printf("\n");
+        printf("If no option is specified, `-i' is considered default.\n");
+        printf("\n");
+
+#undef _OPTION
+#undef _INDENT
+}
+
 static struct option long_options[] = {
         {"help", no_argument, NULL, 'h'},
         {"identification", no_argument, NULL, 'i'},
         {"match-ids", no_argument, NULL, 'm'},
+        {"descriptor-tree", no_argument, NULL, 't'},
         {0, 0, NULL, 0}
 };
-static const char *short_options = "him";
+static const char *short_options = "himt";
 
 int main(int argc, char *argv[])
@@ -147 +161 @@
         bool action_print_short_identification = false;
         bool action_print_match_ids = false;
+        bool action_print_descriptor_tree = false;
 
         /*
@@ -171 +186 @@
                                 action_print_match_ids = true;
                                 break;
+                        case 't':
+                                action_print_descriptor_tree = true;
+                                break;
                         default:
+                                assert(false && "unreachable code");
                                 break;
                 }
@@ -177 +196 @@
 
         /* Set the default action. */
-        if (!action_print_match_ids && !action_print_short_identification) {
+        if (!action_print_match_ids
+            && !action_print_short_identification
+            && !action_print_descriptor_tree) {
                 action_print_short_identification = true;
         }
@@ -215 +236 @@
                         dump_device_match_ids(dev);
                 }
+                if (action_print_descriptor_tree) {
+                        dump_descriptor_tree_brief(dev);
+                }
 
                 /* Destroy the control pipe (close the session etc.). */