Changeset cb569e6 in mainline for uspace/app/init/init.c

Timestamp:

2010-11-18T21:58:27Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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.

File:

• uspace/app/init/init.c (modified) (5 diffs)

uspace/app/init/init.c

@@ -185 +185 @@
         
         /* Wait for the input device to be ready */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -200 +200 @@
 }
 
-static void getterm(const char *dev, const char *app)
+static void getterm(const char *dev, const char *app, bool wmsg)
 {
         char term[DEVMAP_NAME_MAXLEN];
@@ -210 +210 @@
         
         /* Wait for the terminal device to be ready */
-        dev_handle_t handle;
+        devmap_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -218 +218 @@
         }
         
-        rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, term, app, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s %s %s (%s)\n", NAME,
-                    APP_GETTERM, term, app, str_error(rc));
+        if (wmsg) {
+                rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, "-w", term,
+                    app, NULL);
+                if (rc != EOK) {
+                        printf("%s: Error spawning %s -w %s %s (%s)\n", NAME,
+                            APP_GETTERM, term, app, str_error(rc));
+                }
+        } else {
+                rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, term, app,
+                    NULL);
+                if (rc != EOK) {
+                        printf("%s: Error spawning %s %s %s (%s)\n", NAME,
+                            APP_GETTERM, term, app, str_error(rc));
+                }
         }
 }
@@ -295 +305 @@
 #endif
         
-        getterm("term/vc0", "/app/bdsh");
-        getterm("term/vc1", "/app/bdsh");
-        getterm("term/vc2", "/app/bdsh");
-        getterm("term/vc3", "/app/bdsh");
-        getterm("term/vc4", "/app/bdsh");
-        getterm("term/vc5", "/app/bdsh");
-        getterm("term/vc6", "/app/klog");
+        getterm("term/vc0", "/app/bdsh", true);
+        getterm("term/vc1", "/app/bdsh", false);
+        getterm("term/vc2", "/app/bdsh", false);
+        getterm("term/vc3", "/app/bdsh", false);
+        getterm("term/vc4", "/app/bdsh", false);
+        getterm("term/vc5", "/app/bdsh", false);
+        getterm("term/vc6", "/app/klog", false);
         
         return 0;