Changeset 20a3465 in mainline for uspace/app/usbinfo/dump.c

Timestamp:

2011-10-30T19:50:54Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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/dump.c (modified) (4 diffs)

uspace/app/usbinfo/dump.c

@@ -110 +110 @@
 }
 
-static void dump_tree_descriptor(uint8_t *descriptor, size_t depth)
+static void dump_tree_descriptor(const uint8_t *descriptor, size_t depth)
 {
         if (descriptor == NULL) {
                 return;
         }
-        int type = (int) *(descriptor + 1);
+        int type = descriptor[1];
         const char *name = "unknown";
         switch (type) {
@@ -136 +136 @@
 }
 
-static void dump_tree_internal(usb_dp_parser_t *parser, usb_dp_parser_data_t *data,
-    uint8_t *root, size_t depth)
+static void dump_tree_internal(
+    usb_dp_parser_t *parser, usb_dp_parser_data_t *data,
+    const uint8_t *root, size_t depth)
 {
         if (root == NULL) {
@@ -143 +144 @@
         }
         dump_tree_descriptor(root, depth);
-        uint8_t *child = usb_dp_get_nested_descriptor(parser, data, root);
+        const uint8_t *child = usb_dp_get_nested_descriptor(parser, data, root);
         do {
                 dump_tree_internal(parser, data, child, depth + 1);
@@ -152 +153 @@
 static void dump_tree(usb_dp_parser_t *parser, usb_dp_parser_data_t *data)
 {
-        uint8_t *ptr = data->data;
+        const uint8_t *ptr = data->data;
         printf("Descriptor tree:\n");
         dump_tree_internal(parser, data, ptr, 0);