Changeset e2dfa86 in mainline for uspace/app/usbinfo/info.c

Timestamp:

2013-01-27T13:54:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0eb2a0f

Parents:

06f9a9c9

Message:

usb_device: Change API to allow direct(RO) access to descriptors.

File:

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

uspace/app/usbinfo/info.c

@@ -48 +48 @@
 {
         printf("%sDevice 0x%04x by vendor 0x%04x\n", get_indent(0),
-            (int) usb_device_get_device_descriptor(usb_dev)->product_id,
-            (int) usb_device_get_device_descriptor(usb_dev)->vendor_id);
+            usb_device_descriptors(usb_dev)->device.product_id,
+            usb_device_descriptors(usb_dev)->device.vendor_id);
 }
 
@@ -83 +83 @@
         init_match_ids(&matches);
         usb_device_create_match_ids_from_interface(
-            usb_device_get_device_descriptor(usb_dev), iface, &matches);
+            &usb_device_descriptors(usb_dev)->device, iface, &matches);
         dump_match_ids(&matches, get_indent(1));
         clean_match_ids(&matches);
@@ -92 +92 @@
         match_id_list_t matches;
         init_match_ids(&matches);
-        const usb_standard_device_descriptor_t *dev_desc =
-            usb_device_get_device_descriptor(usb_dev);
-        usb_device_create_match_ids_from_device_descriptor(dev_desc, &matches);
+        usb_device_create_match_ids_from_device_descriptor(
+                &usb_device_descriptors(usb_dev)->device, &matches);
         printf("%sDevice match ids (0x%04x by 0x%04x, %s)\n", get_indent(0),
-            (int) dev_desc->product_id, (int) dev_desc->vendor_id,
-            usb_str_class(dev_desc->device_class));
+            usb_device_descriptors(usb_dev)->device.product_id,
+            usb_device_descriptors(usb_dev)->device.vendor_id,
+            usb_str_class(usb_device_descriptors(usb_dev)->device.device_class));
         dump_match_ids(&matches, get_indent(1));
         clean_match_ids(&matches);
 
-        size_t desc_size = 0;
-        const void *desc =
-            usb_device_get_configuration_descriptor(usb_dev, &desc_size);
-
-        usb_dp_walk_simple(desc, desc_size, usb_dp_standard_descriptor_nesting,
+        usb_dp_walk_simple(
+            usb_device_descriptors(usb_dev)->full_config,
+            usb_device_descriptors(usb_dev)->full_config_size,
+            usb_dp_standard_descriptor_nesting,
             dump_match_ids_from_interface, usb_dev);
 }
@@ -230 +229 @@
 {
         dump_descriptor_tree_callback(
-            (const uint8_t *)usb_device_get_device_descriptor(usb_dev),
+            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
             (size_t) -1, NULL);
 
-        size_t desc_size = 0;
-        const void *desc =
-            usb_device_get_configuration_descriptor(usb_dev, &desc_size);
-
-        usb_dp_walk_simple(desc, desc_size, usb_dp_standard_descriptor_nesting,
+        usb_dp_walk_simple(
+            usb_device_descriptors(usb_dev)->full_config,
+            usb_device_descriptors(usb_dev)->full_config_size,
+            usb_dp_standard_descriptor_nesting,
             dump_descriptor_tree_callback, NULL);
 }
@@ -244 +242 @@
 {
         dump_descriptor_tree_callback(
-            (const uint8_t *)usb_device_get_device_descriptor(usb_dev),
+            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
             (size_t) -1, usb_dev);
 
-        size_t desc_size = 0;
-        const void *desc =
-            usb_device_get_configuration_descriptor(usb_dev, &desc_size);
-
-        usb_dp_walk_simple(desc, desc_size, usb_dp_standard_descriptor_nesting,
+        usb_dp_walk_simple(
+            usb_device_descriptors(usb_dev)->full_config,
+            usb_device_descriptors(usb_dev)->full_config_size,
+            usb_dp_standard_descriptor_nesting,
             dump_descriptor_tree_callback, usb_dev);
 }
@@ -299 +296 @@
         uint64_t str_mask = 0;
         find_string_indexes_callback(
-            (const uint8_t *)usb_device_get_device_descriptor(usb_dev), 0,
+            (const uint8_t *)&usb_device_descriptors(usb_dev)->device, 0,
             &str_mask);
-        size_t desc_size = 0;
-        const void *desc =
-            usb_device_get_configuration_descriptor(usb_dev, &desc_size);
-
-        usb_dp_walk_simple(desc, desc_size, usb_dp_standard_descriptor_nesting,
+
+        usb_dp_walk_simple(
+            usb_device_descriptors(usb_dev)->full_config,
+            usb_device_descriptors(usb_dev)->full_config_size,
+            usb_dp_standard_descriptor_nesting,
             find_string_indexes_callback, &str_mask);