Changeset 5f70118 in mainline for uspace/app/init/init.c

Timestamp:

2010-01-10T12:16:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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) (8 diffs)

uspace/app/init/init.c

@@ -48 +48 @@
 #include <string.h>
 #include <devmap.h>
-#include <config.h>
 #include "init.h"
 
+#define DEVFS_MOUNT_POINT  "/dev"
+
+#define SRV_CONSOLE  "/srv/console"
+#define APP_GETTERM  "/app/getterm"
+
 static void info_print(void)
 {
@@ -59 +63 @@
 {
         char *opts = "";
-        const char *root_dev = "initrd";
+        const char *root_dev = "bd/initrd";
         
         if (str_cmp(fstype, "tmpfs") == 0)
@@ -98 +102 @@
         }
         
-        snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
-        int rc = mount("devfs", "/dev", null, "", IPC_FLAG_BLOCKING);
+        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
+        int rc = mount("devfs", DEVFS_MOUNT_POINT, null, "", IPC_FLAG_BLOCKING);
         
         switch (rc) {
@@ -171 +175 @@
         }
 
-        if (texit != TASK_EXIT_NORMAL || retval != 0) {
+        if ((texit != TASK_EXIT_NORMAL) || (retval != 0)) {
                 printf(NAME ": Server %s failed to start (returned %d)\n",
                         fname, retval);
@@ -177 +181 @@
 }
 
-static void getvc(char *dev, char *app)
-{
-        char *argv[4];
-        char vc[MAX_DEVICE_NAME];
+static void console(char *dev)
+{
+        char *argv[3];
+        char hid_in[MAX_DEVICE_NAME];
         int rc;
         
-        snprintf(vc, MAX_DEVICE_NAME, "/dev/%s", dev);
-        
-        printf(NAME ": Spawning getvc on %s\n", vc);
-        
+        snprintf(hid_in, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        
+        printf(NAME ": Spawning %s with %s\n", SRV_CONSOLE, hid_in);
+        
+        /* Wait for the input device to be ready */
         dev_handle_t handle;
         rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         
         if (rc == EOK) {
-                argv[0] = "/app/getvc";
-                argv[1] = vc;
+                argv[0] = SRV_CONSOLE;
+                argv[1] = hid_in;
+                argv[2] = NULL;
+                
+                if (!task_spawn(SRV_CONSOLE, argv))
+                        printf(NAME ": Error spawning %s with %s\n", SRV_CONSOLE, hid_in);
+        } else
+                printf(NAME ": Error waiting on %s\n", hid_in);
+}
+
+static void getterm(char *dev, char *app)
+{
+        char *argv[4];
+        char term[MAX_DEVICE_NAME];
+        int rc;
+        
+        snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        
+        printf(NAME ": Spawning %s with %s %s\n", APP_GETTERM, term, app);
+        
+        /* Wait for the terminal device to be ready */
+        dev_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/getvc", argv))
-                        printf(NAME ": Error spawning getvc on %s\n", vc);
-        } else {
-                printf(NAME ": Error waiting on %s\n", vc);
-        }
+                if (!task_spawn(APP_GETTERM, argv))
+                        printf(NAME ": Error spawning %s with %s %s\n", APP_GETTERM,
+                            term, app);
+        } else
+                printf(NAME ": Error waiting on %s\n", term);
 }
 
@@ -207 +237 @@
         int rc;
 
-        printf("Trying to mount disk0 on /data... ");
+        printf("Trying to mount bd/disk0 on /data... ");
         fflush(stdout);
 
-        rc = mount("fat", "/data", "disk0", "wtcache", 0);
+        rc = mount("fat", "/data", "bd/disk0", "wtcache", 0);
         if (rc == EOK)
                 printf("OK\n");
@@ -233 +263 @@
         }
         
+        spawn("/srv/fhc");
+        spawn("/srv/obio");
+        srv_start("/srv/i8042");
+        srv_start("/srv/c_mouse");
+
         spawn("/srv/fb");
         spawn("/srv/kbd");
-        spawn("/srv/console");
-        spawn("/srv/fhc");
-        spawn("/srv/obio");
+        console("hid_in/kbd");
+        
+        spawn("/srv/clip");
 
         /*
@@ -256 +291 @@
 #endif
 
-        getvc("vc0", "/app/bdsh");
-        getvc("vc1", "/app/bdsh");
-        getvc("vc2", "/app/bdsh");
-        getvc("vc3", "/app/bdsh");
-        getvc("vc4", "/app/bdsh");
-        getvc("vc5", "/app/bdsh");
-        getvc("vc6", "/app/klog");
+        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");
         
         return 0;