Changeset 9370884 in mainline for uspace/app

Timestamp:

2011-03-14T21:22:52Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

15d3b54, a963a68

Parents:

ff34e5a (diff), c69209d (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:

Development branch changes

Location:

uspace/app/usbinfo

Files:

• info.c (modified) (1 diff)
• main.c (modified) (1 diff)

uspace/app/usbinfo/info.c

@@ -65 +65 @@
                 goto leave;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&ctrl_pipe);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": probing default control pipe failed: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
         rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
         if (rc != EOK) {

uspace/app/usbinfo/main.c

@@ -82 +82 @@
 
         if (str_cmp(path, "uhci") == 0) {
-                path = "/hw/pci0/00:01.2/uhci";
+                path = "/hw/pci0/00:01.2/uhci-hc";
         }