Changeset 4f66cc7b in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-03-17T12:45:23Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

4fec9ee, 6e3b9a58

Parents:

45dd8bf (diff), 039c66c (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:

Merged development changes

File:

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

uspace/lib/usb/src/recognise.c

@@ -369 +369 @@
                 goto failure;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&ctrl_pipe);
+        if (rc != EOK) {
+                goto failure;
+        }
 
         /*
@@ -374 +378 @@
          * 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;