Changeset 8a121b1 in mainline for uspace/app

Timestamp:

2011-10-15T11:58:16Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7c95d6f5

Parents:

2a5b62b

Message:

usb: Make descriptors readonly.

Location:

uspace/app/usbinfo

Files:

• desctree.c (modified) (2 diffs)
• dump.c (modified) (3 diffs)
• hid.c (modified) (2 diffs)
• info.c (modified) (3 diffs)
• usbinfo.h (modified) (1 diff)

uspace/app/usbinfo/desctree.c

@@ -50 +50 @@
 
 static void browse_descriptor_tree_internal(usb_dp_parser_t *parser,
-    usb_dp_parser_data_t *data, uint8_t *root, size_t depth,
+    usb_dp_parser_data_t *data, const uint8_t *root, size_t depth,
     dump_descriptor_in_tree_t callback, void *arg)
 {
@@ -57 +57 @@
         }
         callback(root, depth, arg);
-        uint8_t *child = usb_dp_get_nested_descriptor(parser, data, root);
+        const uint8_t *child = usb_dp_get_nested_descriptor(parser, data, root);
         do {
                 browse_descriptor_tree_internal(parser, data, child, depth + 1,

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);

uspace/app/usbinfo/hid.c

@@ -55 +55 @@
 } descriptor_walk_context_t;
 
-static bool is_descriptor_kind(uint8_t *d, usb_descriptor_type_t t)
+static bool is_descriptor_kind(const uint8_t *d, usb_descriptor_type_t t)
 {
         if (d == NULL) {
@@ -180 +180 @@
  * @param arg Custom argument, passed as descriptor_walk_context_t.
  */
-static void descriptor_walk_callback(uint8_t *raw_descriptor,
+static void descriptor_walk_callback(const uint8_t *raw_descriptor,
     size_t depth, void *arg)
 {

uspace/app/usbinfo/info.c

@@ -51 +51 @@
 }
 
-static void dump_match_ids_from_interface(uint8_t *descriptor, size_t depth,
-    void *arg)
+static void dump_match_ids_from_interface(
+    const uint8_t *descriptor, size_t depth, void *arg)
 {
         if (depth != 1) {
@@ -165 +165 @@
 
 
-static void dump_descriptor_tree_callback(uint8_t *descriptor,
-    size_t depth, void *arg)
+static void dump_descriptor_tree_callback(
+    const uint8_t *descriptor, size_t depth, void *arg)
 {
         const char *indent = get_indent(depth + 1);
@@ -246 +246 @@
 }
 
-static void find_string_indexes_callback(uint8_t *descriptor,
-    size_t depth, void *arg)
+static void find_string_indexes_callback(
+    const uint8_t *descriptor, size_t depth, void *arg)
 {
         size_t descriptor_length = descriptor[0];

uspace/app/usbinfo/usbinfo.h

@@ -74 +74 @@
 void destroy_device(usbinfo_device_t *);
 
-typedef void (*dump_descriptor_in_tree_t)(uint8_t *, size_t, void *);
+typedef void (*dump_descriptor_in_tree_t)(const uint8_t *, size_t, void *);
 void browse_descriptor_tree(uint8_t *, size_t, usb_dp_descriptor_nesting_t *,
     dump_descriptor_in_tree_t, size_t, void *);