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

Timestamp:

2011-02-20T21:43:50Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

070f11e, ace12560

Parents:

423e8c81 (diff), 063ead6f (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:

Add simple USB multi interface device driver

The MID driver serves as a mini bus driver for devices with several
interfaces or for devices with classes defined at interface level.

The keyboard driver is working with this driver with the same problems
as before introduction of USB MID driver.

The merge also includes addition of bulk transfers.

File:

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

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;