Changeset 7943c43 in mainline for uspace/app/usbinfo/info.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 mainline changes.

File:

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

uspace/app/usbinfo/info.c

@@ -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. */