Changeset ab27e01 in mainline

Timestamp:

2011-11-05T14:58:00Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b77931d

Parents:

7fc260ff

Message:

liibusbdev: Consider alternate interface when initializing pipes.

Location:

uspace/lib/usbdev/src

Files:

• altiface.c (modified) (1 diff)
• devdrv.c (modified) (7 diffs)

uspace/lib/usbdev/src/altiface.c

@@ -139 +139 @@
                     || (iface->interface_number != interface_number)) {
                         iface_ptr = usb_dp_get_sibling_descriptor(&dp_parser,
-                            &dp_data,
-                            dp_data.data, iface_ptr);
+                            &dp_data, dp_data.data, iface_ptr);
                         continue;
                 }

uspace/lib/usbdev/src/devdrv.c

@@ -81 +81 @@
  * @return Number of pipes (excluding default control pipe).
  */
-static size_t count_other_pipes(const usb_endpoint_description_t **endpoints)
-{
-        size_t count = 0;
-        if (endpoints == NULL) {
-                return 0;
-        }
-
-        while (endpoints[count] != NULL) {
-                count++;
-        }
-
+static inline size_t count_other_pipes(
+    const usb_endpoint_description_t **endpoints)
+{
+        size_t count;
+        for (count = 0; endpoints && endpoints[count] != NULL; ++count);
         return count;
 }
@@ -104 +98 @@
     usb_device_t *dev, int alternate_setting)
 {
+        assert(dev);
+
         if (endpoints == NULL) {
                 dev->pipes = NULL;
@@ -330 +326 @@
  *      (not NULL terminated).
  * @param[out] pipes_count_ptr Where to store number of pipes
- *      (set to if you wish to ignore the count).
+ *      (set to NULL if you wish to ignore the count).
  * @return Error code.
  */
@@ -351 +347 @@
         const size_t pipe_count = count_other_pipes(endpoints);
         if (pipe_count == 0) {
-                *pipes_count_ptr = pipe_count;
+                if (pipes_count_ptr)
+                        *pipes_count_ptr = pipe_count;
                 *pipes_ptr = NULL;
                 return EOK;
@@ -357 +354 @@
 
         usb_endpoint_mapping_t *pipes
-            = malloc(sizeof(usb_endpoint_mapping_t) * pipe_count);
+            = calloc(pipe_count, sizeof(usb_endpoint_mapping_t));
         if (pipes == NULL) {
                 return ENOMEM;
-        }
-
-        /* Initialize to NULL to allow smooth rollback. */
-        for (i = 0; i < pipe_count; i++) {
-                pipes[i].pipe = NULL;
         }
 
@@ -409 +401 @@
 
         if (usb_hc_connection_close(&hc_conn) != EOK)
-                usb_log_warning("usb_device_create_pipes(): "
-                    "Failed to close connection.\n");
+                usb_log_warning("%s: Failed to close connection.\n",
+                    __FUNCTION__);
 
         *pipes_ptr = pipes;
@@ -556 +548 @@
          * it makes no sense to speak about alternate interfaces when
          * controlling a device. */
-        usb_alternate_interfaces_init(&usb_dev->alternate_interfaces,
+        rc = usb_alternate_interfaces_init(&usb_dev->alternate_interfaces,
             usb_dev->descriptors.configuration,
             usb_dev->descriptors.configuration_size, usb_dev->interface_no);
+        const int alternate_iface =
+            (rc == EOK) ? usb_dev->alternate_interfaces.current : 0;
 
         /* TODO Add comment here. */
-        rc = initialize_other_pipes(endpoints, usb_dev, 0);
+        rc = initialize_other_pipes(endpoints, usb_dev, alternate_iface);
         if (rc != EOK) {
                 /* Full configuration descriptor is allocated. */