Changes in uspace/app/usbinfo/main.c [e8f826b:15f3c3f] in mainline

File:

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

uspace/app/usbinfo/main.c

@@ -42 +42 @@
 #include <getopt.h>
 #include <devman.h>
-#include <devmap.h>
+#include <loc.h>
 #include <usb/hc.h>
 #include <usb/dev/pipes.h>
@@ -56 +56 @@
         printf("Usage: %s [options] device [device [device [ ... ]]]\n",
             app_name);
-        printf(_INDENT "The device is a devman path to the device.\n");
+        printf(_INDENT "The device can be specified in two ways.\n");
+        printf(_INDENT "  o Using its devman path, e.g. /hw/pci0/.../usb00_a1.\n");
+        printf(_INDENT "  o Or using BUS.ADDR numbers as printed by lsusb.\n");
 
         _OPTION("-h --help", "Print this help and exit.");
@@ -65 +67 @@
         _OPTION("-s --strings", "Try to print all string descriptors.");
         _OPTION("-S --status", "Get status of the device.");
+        _OPTION("-r --hid-report", "Dump HID report descriptor.");
+        _OPTION("-r --hid-report-usages", "Dump usages of HID report.");
 
         printf("\n");
@@ -82 +86 @@
         {"strings", no_argument, NULL, 's'},
         {"status", no_argument, NULL, 'S'},
+        {"hid-report", no_argument, NULL, 'r'},
+        {"hid-report-usages", no_argument, NULL, 'R'},
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himtTsS";
+static const char *short_options = "himtTsSrR";
 
 static usbinfo_action_t actions[] = {
@@ -115 +121 @@
                 .opt = 'S',
                 .action = dump_status,
+                .active = false
+        },
+        {
+                .opt = 'r',
+                .action = dump_hidreport_raw,
+                .active = false
+        },
+        {
+                .opt = 'R',
+                .action = dump_hidreport_usages,
                 .active = false
         },