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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (11 diffs)

uspace/app/init/init.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <ipc/ipc.h>
 #include <vfs/vfs.h>
 #include <bool.h>
@@ -57 +56 @@
 #define DEVFS_MOUNT_POINT  "/dev"
 
-#define SCRATCH_FS_TYPE      "tmpfs"
-#define SCRATCH_MOUNT_POINT  "/scratch"
+#define TMPFS_FS_TYPE      "tmpfs"
+#define TMPFS_MOUNT_POINT  "/tmp"
 
 #define DATA_FS_TYPE      "fat"
-#define DATA_DEVICE       "bd/disk0"
+#define DATA_DEVICE       "bd/ata1disk0"
 #define DATA_MOUNT_POINT  "/data"
 
@@ -124 +123 @@
 static void spawn(const char *fname)
 {
-        const char *argv[2];
+        int rc;
         struct stat s;
         
@@ -131 +130 @@
         
         printf("%s: Spawning %s\n", NAME, fname);
-        
-        argv[0] = fname;
-        argv[1] = NULL;
-        
-        int err;
-        if (!task_spawn(fname, argv, &err))
+        rc = task_spawnl(NULL, fname, fname, NULL);
+        if (rc != EOK) {
                 printf("%s: Error spawning %s (%s)\n", NAME, fname,
-                    str_error(err));
+                    str_error(rc));
+        }
 }
 
 static void srv_start(const char *fname)
 {
-        const char *argv[2];
         task_id_t id;
         task_exit_t texit;
@@ -153 +148 @@
         
         printf("%s: Starting %s\n", NAME, fname);
-        
-        argv[0] = fname;
-        argv[1] = NULL;
-        
-        id = task_spawn(fname, argv, &retval);
+        rc = task_spawnl(&id, fname, fname, NULL);
         if (!id) {
                 printf("%s: Error spawning %s (%s)\n", NAME, fname,
-                    str_error(retval));
+                    str_error(rc));
                 return;
         }
@@ -167 +158 @@
         if (rc != EOK) {
                 printf("%s: Error waiting for %s (%s(\n", NAME, fname,
-                    str_error(retval));
-                return;
-        }
-        
-        if ((texit != TASK_EXIT_NORMAL) || (retval != 0)) {
-                printf("%s: Server %s failed to start (%s)\n", NAME,
-                        fname, str_error(retval));
+                    str_error(rc));
+                return;
+        }
+        
+        if (texit != TASK_EXIT_NORMAL) {
+                printf("%s: Server %s failed to start (unexpectedly "
+                    "terminated)\n", NAME, fname);
+                return;
+        }
+
+        if (retval != 0) {
+                printf("%s: Server %s failed to start (exit code %d)\n", NAME,
+                        fname, retval);
         }
 }
@@ -179 +176 @@
 static void console(const char *dev)
 {
-        const char *argv[3];
         char hid_in[DEVMAP_NAME_MAXLEN];
         int rc;
@@ -188 +184 @@
         
         /* 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) {
-                argv[0] = SRV_CONSOLE;
-                argv[1] = hid_in;
-                argv[2] = NULL;
-                
-                if (!task_spawn(SRV_CONSOLE, argv, &rc))
-                        printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE,
-                            hid_in, str_error(rc));
-        } else
+        if (rc != EOK) {
                 printf("%s: Error waiting on %s (%s)\n", NAME, hid_in,
                     str_error(rc));
-}
-
-static void getterm(const char *dev, const char *app)
-{
-        const char *argv[4];
+                return;
+        }
+        
+        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, hid_in, NULL);
+        if (rc != EOK) {
+                printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE,
+                    hid_in, str_error(rc));
+        }
+}
+
+static void getterm(const char *dev, const char *app, bool wmsg)
+{
         char term[DEVMAP_NAME_MAXLEN];
         int rc;
@@ -215 +209 @@
         
         /* 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) {
-                argv[0] = APP_GETTERM;
-                argv[1] = term;
-                argv[2] = app;
-                argv[3] = NULL;
-                
-                if (!task_spawn(APP_GETTERM, argv, &rc))
-                        printf("%s: Error spawning %s %s %s (%s)\n", NAME, APP_GETTERM,
-                            term, app, str_error(rc));
-        } else
+        if (rc != EOK) {
                 printf("%s: Error waiting on %s (%s)\n", NAME, term,
                     str_error(rc));
-}
-
-static bool mount_scratch(void)
-{
-        int rc = mount(SCRATCH_FS_TYPE, SCRATCH_MOUNT_POINT, "", "", 0);
-        return mount_report("Scratch filesystem", SCRATCH_MOUNT_POINT,
-            SCRATCH_FS_TYPE, NULL, rc);
+                return;
+        }
+        
+        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));
+                }
+        }
+}
+
+static bool mount_tmpfs(void)
+{
+        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0);
+        return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
+            TMPFS_FS_TYPE, NULL, rc);
 }
 
@@ -268 +270 @@
         }
         
-        mount_scratch();
-        
+        mount_tmpfs();
+        
+#ifdef CONFIG_START_DEVMAN
+        spawn("/srv/devman");
+#endif
+        spawn("/srv/apic");
+        spawn("/srv/i8259");
         spawn("/srv/fhc");
         spawn("/srv/obio");
@@ -302 +309 @@
 #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;