Changeset 18cb870 in mainline

Timestamp:

2011-02-20T17:02:09Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8ba18c6

Parents:

27a0012

Message:

Extend pipe initialization with interface number

Location:

uspace/lib/usb

Files:

• include/usb/pipes.h (modified) (1 diff)
• src/pipesinit.c (modified) (3 diffs)

uspace/lib/usb/include/usb/pipes.h

@@ -107 +107 @@
         /** Endpoint description. */
         const usb_endpoint_description_t *description;
+        /** Interface number the endpoint must belong to (-1 for any). */
+        const int interface_no;
         /** Found descriptor fitting the description. */
         usb_standard_endpoint_descriptor_t *descriptor;

uspace/lib/usb/src/pipesinit.c

@@ -109 +109 @@
  * @param mapping_count Number of endpoint mappings in @p mapping.
  * @param found_endpoint Description of found endpoint.
+ * @param interface_number Number of currently processed interface.
  * @return Endpoint mapping corresponding to @p found_endpoint.
  * @retval NULL No corresponding endpoint found.
@@ -114 +115 @@
 static usb_endpoint_mapping_t *find_endpoint_mapping(
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
-    usb_endpoint_description_t *found_endpoint)
+    usb_endpoint_description_t *found_endpoint,
+    int interface_number)
 {
         while (mapping_count > 0) {
-                if (endpoint_fits_description(mapping->description,
-                    found_endpoint)) {
+                bool interface_number_fits = (mapping->interface_no < 0)
+                    || (mapping->interface_no == interface_number);
+
+                bool endpoint_descriptions_fits = endpoint_fits_description(
+                    mapping->description, found_endpoint);
+
+                if (interface_number_fits && endpoint_descriptions_fits) {
                         return mapping;
                 }
@@ -169 +176 @@
          */
         usb_endpoint_mapping_t *ep_mapping = find_endpoint_mapping(mapping,
-            mapping_count, &description);
+            mapping_count, &description, interface->interface_number);
         if (ep_mapping == NULL) {
                 return ENOENT;