Changeset 441633f in mainline

Timestamp:

2011-12-14T21:47:24Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

64e3dad

Parents:

6883abfa

Message:

libusbdev: Cleanup.

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (7 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -107 +107 @@
         }
 
-        usb_endpoint_mapping_t *pipes;
-        size_t pipes_count;
-
-        int rc = usb_device_create_pipes(&dev->wire, endpoints,
+        usb_endpoint_mapping_t *pipes = NULL;
+        size_t pipes_count = 0;
+
+        const int rc = usb_device_create_pipes(&dev->wire, endpoints,
             dev->descriptors.configuration, dev->descriptors.configuration_size,
             dev->interface_no, alternate_setting, &pipes, &pipes_count);
 
-        if (rc != EOK) {
-                return rc;
-        }
-
-        dev->pipes = pipes;
-        dev->pipes_count = pipes_count;
-
-        return EOK;
+        if (rc == EOK) {
+                dev->pipes = pipes;
+                dev->pipes_count = pipes_count;
+        }
+
+        return rc;
 }
 /*----------------------------------------------------------------------------*/
@@ -238 +236 @@
         }
 
-        int rc;
-
         /* Destroy existing pipes. */
         destroy_current_pipes(dev);
 
         /* Change the interface itself. */
-        rc = usb_request_set_interface(&dev->ctrl_pipe, dev->interface_no,
+        int rc = usb_request_set_interface(&dev->ctrl_pipe, dev->interface_no,
             alternate_setting);
         if (rc != EOK) {
@@ -309 +305 @@
  * - registers endpoints with the host controller
  *
- * @param[in] dev Generic DDF device backing the USB one.
  * @param[in] wire Initialized backing connection to the host controller.
  * @param[in] endpoints Endpoints description, NULL terminated.
@@ -351 +346 @@
         }
 
-        /* Now allocate and fully initialize. */
+        /* Now initialize. */
         for (i = 0; i < pipe_count; i++) {
                 pipes[i].description = endpoints[i];
@@ -362 +357 @@
             config_descr, config_descr_size, wire);
         if (rc != EOK) {
-                goto rollback_free_only;
-        }
-
+                free(pipes);
+                return rc;
+        }
+
+        /* Register created pipes. */
         for (i = 0; i < pipe_count; i++) {
                 if (pipes[i].present) {
@@ -395 +392 @@
         }
 
-        /*
-         * Jump here if something went wrong before some actual communication
-         * with HC. Then the only thing that needs to be done is to free
-         * allocated memory.
-         */
-rollback_free_only:
         free(pipes);
-
         return rc;
 }
@@ -408 +398 @@
 /** Destroy pipes previously created by usb_device_create_pipes.
  *
- * @param[in] dev Generic DDF device backing the USB one.
  * @param[in] pipes Endpoint mapping to be destroyed.
  * @param[in] pipes_count Number of endpoints.