Changeset a4e18e1 in mainline for uspace/lib/usb/src/pipesinit.c

Timestamp:

2011-04-07T15:04:16Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

36cd378

Parents:

9d06563 (diff), a82889e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

partial merge form usb/development

File:

• uspace/lib/usb/src/pipesinit.c (modified) (3 diffs)

uspace/lib/usb/src/pipesinit.c

@@ -121 +121 @@
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     usb_endpoint_description_t *found_endpoint,
-    int interface_number)
+    int interface_number, int interface_setting)
 {
         while (mapping_count > 0) {
@@ -127 +127 @@
                     || (mapping->interface_no == interface_number);
 
+                bool interface_setting_fits = (mapping->interface_setting < 0)
+                    || (mapping->interface_setting == interface_setting);
+
                 bool endpoint_descriptions_fits = endpoint_fits_description(
                     mapping->description, found_endpoint);
 
-                if (interface_number_fits && endpoint_descriptions_fits) {
+                if (interface_number_fits
+                    && interface_setting_fits
+                    && endpoint_descriptions_fits) {
                         return mapping;
                 }
@@ -181 +186 @@
          */
         usb_endpoint_mapping_t *ep_mapping = find_endpoint_mapping(mapping,
-            mapping_count, &description, interface->interface_number);
+            mapping_count, &description,
+            interface->interface_number, interface->alternate_setting);
         if (ep_mapping == NULL) {
                 return ENOENT;