Changeset 72af8da in mainline for uspace/app

Timestamp:

2011-03-16T18:50:17Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

42a3a57

Parents:

3e7b7cd (diff), fcf07e6 (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 from usb/development

Location:

uspace/app

Files:

• bdsh/cmds/modules/mkfile/mkfile.c (modified) (1 diff)
• usbinfo/info.c (modified) (1 diff)
• usbinfo/main.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -125 +125 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "s:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':

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";
         }