Changeset b77931d in mainline for uspace/lib/usbdev/src

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.

Location:

uspace/lib/usbdev/src

Files:

• devdrv.c (modified) (5 diffs)
• devpoll.c (modified) (3 diffs)
• pipesinit.c (modified) (4 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -361 +361 @@
         /* Now allocate and fully initialize. */
         for (i = 0; i < pipe_count; i++) {
-                pipes[i].pipe = malloc(sizeof(usb_pipe_t));
-                if (pipes[i].pipe == NULL) {
-                        rc = ENOMEM;
-                        goto rollback_free_only;
-                }
                 pipes[i].description = endpoints[i];
                 pipes[i].interface_no = interface_no;
@@ -392 +387 @@
         for (i = 0; i < pipe_count; i++) {
                 if (pipes[i].present) {
-                        rc = usb_pipe_register(pipes[i].pipe,
+                        rc = usb_pipe_register(&pipes[i].pipe,
                             pipes[i].descriptor->poll_interval, &hc_conn);
                         if (rc != EOK) {
@@ -420 +415 @@
         for (i = 0; i < pipe_count; i++) {
                 if (pipes[i].present) {
-                        usb_pipe_unregister(pipes[i].pipe, &hc_conn);
+                        usb_pipe_unregister(&pipes[i].pipe, &hc_conn);
                 }
         }
@@ -434 +429 @@
          */
 rollback_free_only:
-        for (i = 0; i < pipe_count; i++) {
-                if (pipes[i].pipe != NULL) {
-                        free(pipes[i].pipe);
-                }
-        }
         free(pipes);
 
@@ -480 +470 @@
                     i, pipes[i].present ? "" : "not ");
                 if (pipes[i].present)
-                        usb_pipe_unregister(pipes[i].pipe, &hc_conn);
-                free(pipes[i].pipe);
+                        usb_pipe_unregister(&pipes[i].pipe, &hc_conn);
         }
 

uspace/lib/usbdev/src/devpoll.c

@@ -73 +73 @@
 
         usb_pipe_t *pipe
-            = polling_data->dev->pipes[polling_data->pipe_index].pipe;
+            = &polling_data->dev->pipes[polling_data->pipe_index].pipe;
         
         if (polling_data->debug > 0) {
@@ -208 +208 @@
                 return EINVAL;
         }
-        if ((dev->pipes[pipe_index].pipe->transfer_type != USB_TRANSFER_INTERRUPT)
-            || (dev->pipes[pipe_index].pipe->direction != USB_DIRECTION_IN)) {
+        if ((dev->pipes[pipe_index].pipe.transfer_type != USB_TRANSFER_INTERRUPT)
+            || (dev->pipes[pipe_index].pipe.direction != USB_DIRECTION_IN)) {
                 return EINVAL;
         }
@@ -254 +254 @@
                 return EINVAL;
         }
-        if ((dev->pipes[pipe_index].pipe->transfer_type != USB_TRANSFER_INTERRUPT)
-            || (dev->pipes[pipe_index].pipe->direction != USB_DIRECTION_IN)) {
+        if ((dev->pipes[pipe_index].pipe.transfer_type != USB_TRANSFER_INTERRUPT)
+            || (dev->pipes[pipe_index].pipe.direction != USB_DIRECTION_IN)) {
                 return EINVAL;
         }

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