Changes in uspace/app/usbinfo/info.c [e51a514:b25199bc] in mainline

File:

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

uspace/app/usbinfo/info.c

@@ -51 +51 @@
 }
 
-static void dump_match_ids_from_interface(uint8_t *descriptor, size_t depth,
-    void *arg)
+static void dump_match_ids_from_interface(
+    const uint8_t *descriptor, size_t depth, void *arg)
 {
         if (depth != 1) {
@@ -165 +165 @@
 
 
-static void dump_descriptor_tree_callback(uint8_t *descriptor,
-    size_t depth, void *arg)
+static void dump_descriptor_tree_callback(
+    const uint8_t *descriptor, size_t depth, void *arg)
 {
         const char *indent = get_indent(depth + 1);
@@ -246 +246 @@
 }
 
-static void find_string_indexes_callback(uint8_t *descriptor,
-    size_t depth, void *arg)
+static void find_string_indexes_callback(
+    const uint8_t *descriptor, size_t depth, void *arg)
 {
         size_t descriptor_length = descriptor[0];
@@ -287 +287 @@
 void dump_strings(usbinfo_device_t *dev)
 {
+        /* Find used indexes. Devices with more than 64 strings are very rare.*/
+        uint64_t str_mask = 0;
+        find_string_indexes_callback((uint8_t *)&dev->device_descriptor, 0,
+            &str_mask);
+        usb_dp_walk_simple(dev->full_configuration_descriptor,
+            dev->full_configuration_descriptor_size,
+            usb_dp_standard_descriptor_nesting,
+            find_string_indexes_callback,
+            &str_mask);
+
+        if (str_mask == 0) {
+                printf("Device does not support string descriptors.\n");
+                return;
+        }
+
         /* Get supported languages. */
         l18_win_locales_t *langs;
@@ -305 +320 @@
         }
         printf(".\n");
-
-        /* Find used indexes. Device with more than 64 strings are very rare.
-         */
-        uint64_t str_mask = 0;
-        find_string_indexes_callback((uint8_t *)&dev->device_descriptor, 0,
-            &str_mask);
-        usb_dp_walk_simple(dev->full_configuration_descriptor,
-            dev->full_configuration_descriptor_size,
-            usb_dp_standard_descriptor_nesting,
-            find_string_indexes_callback,
-            &str_mask);
 
         /* Get all strings and dump them. */