Changeset 00aece0 in mainline for uspace/drv/bus/usb/usbmid/dump.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/drv/bus/usb/usbmid/dump.c (modified) (4 diffs)

uspace/drv/bus/usb/usbmid/dump.c

@@ -47 +47 @@
  * @param depth Nesting depth.
  */
-static void dump_tree_descriptor(uint8_t *data, size_t depth)
+static void dump_tree_descriptor(const uint8_t *data, size_t depth)
 {
         if (data == NULL) {
                 return;
         }
-        int type = (int) *(data + 1);
+        const int type = data[1];
         if (type == USB_DESCTYPE_INTERFACE) {
                 usb_standard_interface_descriptor_t *descriptor
@@ -71 +71 @@
  * @param depth Nesting depth.
  */
-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) {
@@ -78 +79 @@
         }
         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);
@@ -92 +93 @@
 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;
         dump_tree_internal(parser, data, ptr, 0);
 }