Changeset 361e61b in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-03-21T14:23:15Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

55e388a1

Parents:

c32688d (diff), 48fe0c9 (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:

merge with development

File:

• uspace/lib/usb/src/recognise.c (modified) (4 diffs)

uspace/lib/usb/src/recognise.c

@@ -247 +247 @@
 #undef VENDOR_ONLY_FMT
 #undef VENDOR_ONLY_ARGS
+
+        /* As a last resort, try fallback driver. */
+        ADD_MATCHID_OR_RETURN(matches, 10, "usb&interface&fallback");
 
         return EOK;
@@ -291 +294 @@
         }
         
+        /* As a last resort, try fallback driver. */
+        ADD_MATCHID_OR_RETURN(matches, 10, "usb&fallback");
+
         return EOK;
 }
@@ -369 +375 @@
                 goto failure;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&ctrl_pipe);
+        if (rc != EOK) {
+                goto failure;
+        }
 
         /*
@@ -374 +384 @@
          * naming etc., something more descriptive could be created.
          */
-        rc = asprintf(&child_name, "usbdev%02zu", this_device_name_index);
+        rc = asprintf(&child_name, "usb%02zu_a%d",
+            this_device_name_index, address);
         if (rc < 0) {
                 goto failure;