Changeset 8e7c9fe in mainline for uspace/app/redir/redir.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/app/redir/redir.c (modified) (3 diffs)

uspace/app/redir/redir.c

@@ -75 +75 @@
 }
 
-static task_id_t spawn(int argc, char *argv[])
+static task_id_t spawn(task_wait_t *wait, int argc, char *argv[])
 {
         const char **args;
@@ -93 +93 @@
         args[argc] = NULL;
         
-        rc = task_spawnv(&id, argv[0], args);
+        rc = task_spawnv(&id, wait, argv[0], args);
         
         free(args);
@@ -152 +152 @@
          */
         setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
-        
-        task_id_t id = spawn(argc - i, argv + i);
+
+        task_wait_t wait;       
+        task_id_t id = spawn(&wait, argc - i, argv + i);
         
         if (id != 0) {
                 task_exit_t texit;
                 int retval;
-                task_wait(id, &texit, &retval);
+                task_wait(&wait, &texit, &retval);
                 
                 return retval;