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

Timestamp:

2011-11-05T16:08:01Z (13 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/devdrv.c (modified) (5 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);
         }