Changeset e3f7418 in mainline for uspace/lib/usbdev/src/dp.c

Timestamp:

2011-10-15T13:06:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a044f71

Parents:

3958e315 (diff), 065064e6 (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:

USB improvements.

USB unplug part2; Unplug support in all drivers (except for unused usbmouse driver).
Make descriptor paring work on const pointers.
Fixes several crashes and memory leaks.

File:

• uspace/lib/usbdev/src/dp.c (modified) (15 diffs)

uspace/lib/usbdev/src/dp.c

@@ -75 +75 @@
  * @return Whether @p ptr points inside <code>data->data</code> field.
  */
-static bool is_valid_descriptor_pointer(usb_dp_parser_data_t *data,
-    uint8_t *ptr)
+static bool is_valid_descriptor_pointer(const usb_dp_parser_data_t *data,
+    const uint8_t *ptr)
 {
         if (ptr == NULL) {
@@ -100 +100 @@
  * @retval NULL Invalid input or no next descriptor.
  */
-static uint8_t *get_next_descriptor(usb_dp_parser_data_t *data,
-    uint8_t *current)
+static const uint8_t *get_next_descriptor(const usb_dp_parser_data_t *data,
+    const uint8_t *current)
 {
         assert(is_valid_descriptor_pointer(data, current));
 
-        uint8_t current_length = *current;
-        uint8_t *next = current + current_length;
+        const uint8_t current_length = *current;
+        const uint8_t *next = current + current_length;
 
         if (!is_valid_descriptor_pointer(data, next)) {
@@ -124 +124 @@
  * @retval -1 Invalid input.
  */
-static int get_descriptor_type(usb_dp_parser_data_t *data, uint8_t *start)
+static int get_descriptor_type(const usb_dp_parser_data_t *data, const uint8_t *start)
 {
         if (start == NULL) {
@@ -145 +145 @@
  * @return Whether @p child could be child of @p parent.
  */
-static bool is_nested_descriptor_type(usb_dp_parser_t *parser,
+static bool is_nested_descriptor_type(const usb_dp_parser_t *parser,
     int child, int parent)
 {
-        usb_dp_descriptor_nesting_t *nesting = parser->nesting;
+        const usb_dp_descriptor_nesting_t *nesting = parser->nesting;
         while ((nesting->child > 0) && (nesting->parent > 0)) {
                 if ((nesting->child == child) && (nesting->parent == parent)) {
@@ -166 +166 @@
  * @return Whether @p child could be child of @p parent.
  */
-static bool is_nested_descriptor(usb_dp_parser_t *parser,
-    usb_dp_parser_data_t *data, uint8_t *child, uint8_t *parent)
+static bool is_nested_descriptor(const usb_dp_parser_t *parser,
+    const usb_dp_parser_data_t *data, const uint8_t *child, const uint8_t *parent)
 {
         return is_nested_descriptor_type(parser,
@@ -183 +183 @@
  * @retval NULL Invalid input.
  */
-uint8_t *usb_dp_get_nested_descriptor(usb_dp_parser_t *parser,
-    usb_dp_parser_data_t *data, uint8_t *parent)
+const uint8_t *usb_dp_get_nested_descriptor(const usb_dp_parser_t *parser,
+    const usb_dp_parser_data_t *data, const uint8_t *parent)
 {
         if (!is_valid_descriptor_pointer(data, parent)) {
@@ -190 +190 @@
         }
 
-        uint8_t *next = get_next_descriptor(data, parent);
+        const uint8_t *next = get_next_descriptor(data, parent);
         if (next == NULL) {
                 return NULL;
@@ -211 +211 @@
  * @retval NULL Invalid input.
  */
-static uint8_t *skip_nested_descriptors(usb_dp_parser_t *parser,
-    usb_dp_parser_data_t *data, uint8_t *parent)
-{
-        uint8_t *child = usb_dp_get_nested_descriptor(parser, data, parent);
+static const uint8_t *skip_nested_descriptors(const usb_dp_parser_t *parser,
+    const usb_dp_parser_data_t *data, const uint8_t *parent)
+{
+        const uint8_t *child =
+            usb_dp_get_nested_descriptor(parser, data, parent);
         if (child == NULL) {
                 return get_next_descriptor(data, parent);
         }
-        uint8_t *next_child = skip_nested_descriptors(parser, data, child);
+        const uint8_t *next_child =
+            skip_nested_descriptors(parser, data, child);
         while (is_nested_descriptor(parser, data, next_child, parent)) {
                 next_child = skip_nested_descriptors(parser, data, next_child);
@@ -236 +238 @@
  * @retval NULL Invalid input.
  */
-uint8_t *usb_dp_get_sibling_descriptor(usb_dp_parser_t *parser,
-    usb_dp_parser_data_t *data, uint8_t *parent, uint8_t *sibling)
+const uint8_t *usb_dp_get_sibling_descriptor(
+    const usb_dp_parser_t *parser, const usb_dp_parser_data_t *data,
+    const uint8_t *parent, const uint8_t *sibling)
 {
         if (!is_valid_descriptor_pointer(data, parent)
@@ -244 +247 @@
         }
 
-        uint8_t *possible_sibling = skip_nested_descriptors(parser, data, sibling);
+        const uint8_t *possible_sibling =
+            skip_nested_descriptors(parser, data, sibling);
         if (possible_sibling == NULL) {
                 return NULL;
@@ -269 +273 @@
  * @param arg Custom (user) argument.
  */
-static void usb_dp_browse_simple_internal(usb_dp_parser_t *parser,
-    usb_dp_parser_data_t *data, uint8_t *root, size_t depth,
-    void (*callback)(uint8_t *, size_t, void *), void *arg)
+static void usb_dp_browse_simple_internal(const usb_dp_parser_t *parser,
+    const usb_dp_parser_data_t *data, const uint8_t *root, size_t depth,
+    void (*callback)(const uint8_t *, size_t, void *), void *arg)
 {
         if (root == NULL) {
@@ -277 +281 @@
         }
         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 {
                 usb_dp_browse_simple_internal(parser, data, child, depth + 1,
@@ -301 +305 @@
  */
 void usb_dp_walk_simple(uint8_t *descriptors, size_t descriptors_size,
-    usb_dp_descriptor_nesting_t *descriptor_nesting,
-    void (*callback)(uint8_t *, size_t, void *), void *arg)
+    const usb_dp_descriptor_nesting_t *descriptor_nesting,
+    walk_callback_t callback, void *arg)
 {
         if ((descriptors == NULL) || (descriptors_size == 0)
@@ -309 +313 @@
         }
 
-        usb_dp_parser_data_t data = {
+        const usb_dp_parser_data_t data = {
                 .data = descriptors,
                 .size = descriptors_size,
@@ -315 +319 @@
         };
 
-        usb_dp_parser_t parser = {
+        const usb_dp_parser_t parser = {
                 .nesting = descriptor_nesting
         };