Changeset b77931d in mainline for uspace/lib/usbdev/src/pipesinit.c

Timestamp:

2011-11-05T16:08:01Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d176b1d

Parents:

ab27e01

Message:

usb: usb_pipe_t was always allocated in usb_endpoint_mapping_t, embed it.

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (4 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -192 +192 @@
         }
 
-        if (ep_mapping->pipe == NULL) {
-                return EBADMEM;
-        }
         if (ep_mapping->present) {
                 return EEXISTS;
         }
 
-        int rc = usb_pipe_initialize(ep_mapping->pipe, wire,
+        int rc = usb_pipe_initialize(&ep_mapping->pipe, wire,
             ep_no, description.transfer_type, endpoint->max_packet_size,
             description.direction);
@@ -254 +251 @@
  *
  * The mapping array is expected to conform to following rules:
- * - @c pipe must point to already allocated structure with uninitialized pipe
+ * - @c pipe must be uninitialized pipe
  * - @c description must point to prepared endpoint description
  * - @c descriptor does not need to be initialized (will be overwritten)
@@ -297 +294 @@
         }
 
-        /*
-         * Go through the mapping and set all endpoints to not present.
-         */
-        size_t i;
-        for (i = 0; i < mapping_count; i++) {
+        /* Go through the mapping and set all endpoints to not present. */
+        for (size_t i = 0; i < mapping_count; i++) {
                 mapping[i].present = false;
                 mapping[i].descriptor = NULL;
@@ -307 +301 @@
         }
 
-        /*
-         * Prepare the descriptor parser.
-         */
+        /* Prepare the descriptor parser. */
         const usb_dp_parser_t dp_parser = {
                 .nesting = descriptor_nesting