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

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

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

uspace/app/usbinfo/info.c

@@ -93 +93 @@
         init_match_ids(&matches);
         usb_device_create_match_ids_from_device_descriptor(
-                &usb_device_descriptors(usb_dev)->device, &matches);
+            &usb_device_descriptors(usb_dev)->device, &matches);
         printf("%sDevice match ids (0x%04x by 0x%04x, %s)\n", get_indent(0),
             usb_device_descriptors(usb_dev)->device.product_id,
@@ -229 +229 @@
 {
         dump_descriptor_tree_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device,
             (size_t) -1, NULL);
 
@@ -242 +242 @@
 {
         dump_descriptor_tree_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device,
             (size_t) -1, usb_dev);
 
@@ -296 +296 @@
         uint64_t str_mask = 0;
         find_string_indexes_callback(
-            (const uint8_t *)&usb_device_descriptors(usb_dev)->device, 0,
+            (const uint8_t *) &usb_device_descriptors(usb_dev)->device, 0,
             &str_mask);