Changeset 8e7c9fe in mainline for uspace/srv/hid/remcons/remcons.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/srv/hid/remcons/remcons.c (modified) (3 diffs)

uspace/srv/hid/remcons/remcons.c

@@ -40 +40 @@
 #include <str_error.h>
 #include <loc.h>
-#include <event.h>
 #include <io/keycode.h>
 #include <align.h>
@@ -225 +224 @@
 {
         telnet_user_t *user = arg;
-        int rc;
-
-        char term[LOC_NAME_MAXLEN];
-        snprintf(term, LOC_NAME_MAXLEN, "%s/%s", "/loc", user->service_name);
-
+        
         task_id_t task;
-        rc = task_spawnl(&task, APP_GETTERM, APP_GETTERM, "-w", term, APP_SHELL, NULL);
-        if (rc != EOK) {
-                telnet_user_error(user, "Spawning `%s -w %s %s' failed: %s.",
-                    APP_GETTERM, term, APP_SHELL, str_error(rc));
+        task_wait_t wait;
+        int rc = task_spawnl(&task, &wait, APP_GETTERM, APP_GETTERM, user->service_name,
+            "/loc", "--msg", "--", APP_SHELL, NULL);
+        if (rc != EOK) {
+                telnet_user_error(user, "Spawning `%s %s /loc --msg -- %s' "
+                    "failed: %s.", APP_GETTERM, user->service_name, APP_SHELL,
+                    str_error(rc));
                 fibril_mutex_lock(&user->guard);
                 user->task_finished = true;
@@ -249 +247 @@
         task_exit_t task_exit;
         int task_retval;
-        task_wait(task, &task_exit, &task_retval);
+        task_wait(&wait, &task_exit, &task_retval);
         telnet_user_log(user, "%s terminated %s, exit code %d.", APP_GETTERM,
             task_exit == TASK_EXIT_NORMAL ? "normally" : "unexpectedly",