Changes in uspace/app/init/init.c [28be7fa:5ebdf94] in mainline

File:

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

uspace/app/init/init.c

@@ -50 +50 @@
 #include "init.h"
 
-#define DEVFS_MOUNT_POINT  "/dev"
-
-#define SRV_CONSOLE  "/srv/console"
-#define APP_GETTERM  "/app/getterm"
-
 static void info_print(void)
 {
@@ -63 +58 @@
 {
         char *opts = "";
-        const char *root_dev = "bd/initrd";
+        const char *root_dev = "initrd";
         
         if (str_cmp(fstype, "tmpfs") == 0)
@@ -94 +89 @@
 static bool mount_devfs(void)
 {
-        int rc = mount("devfs", DEVFS_MOUNT_POINT, "", "", IPC_FLAG_BLOCKING);
+        char null[MAX_DEVICE_NAME];
+        int null_id = devmap_null_create();
+        
+        if (null_id == -1) {
+                printf(NAME ": Unable to create null device\n");
+                return false;
+        }
+        
+        snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
+        int rc = mount("devfs", "/dev", null, "", IPC_FLAG_BLOCKING);
         
         switch (rc) {
@@ -102 +106 @@
         case EBUSY:
                 printf(NAME ": Device filesystem already mounted\n");
+                devmap_null_destroy(null_id);
                 return false;
         case ELIMIT:
                 printf(NAME ": Unable to mount device filesystem\n");
+                devmap_null_destroy(null_id);
                 return false;
         case ENOENT:
                 printf(NAME ": Unknown filesystem type (devfs)\n");
+                devmap_null_destroy(null_id);
                 return false;
         default:
                 printf(NAME ": Error mounting device filesystem (%d)\n", rc);
+                devmap_null_destroy(null_id);
                 return false;
         }
@@ -162 +170 @@
         }
 
-        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);
@@ -168 +176 @@
 }
 
-static void console(char *dev)
-{
-        char *argv[3];
-        char hid_in[DEVMAP_NAME_MAXLEN];
+static void getvc(char *dev, char *app)
+{
+        char *argv[4];
+        char vc[MAX_DEVICE_NAME];
         int rc;
         
-        snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%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 */
+        snprintf(vc, MAX_DEVICE_NAME, "/dev/%s", dev);
+        
+        printf(NAME ": Spawning getvc on %s\n", vc);
+        
         dev_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))
-                        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[DEVMAP_NAME_MAXLEN];
-        int rc;
-        
-        snprintf(term, DEVMAP_NAME_MAXLEN, "%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[0] = "/app/getvc";
+                argv[1] = vc;
                 argv[2] = app;
                 argv[3] = NULL;
                 
-                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);
-}
-
-static void mount_scratch(void)
+                if (!task_spawn("/app/getvc", argv))
+                        printf(NAME ": Error spawning getvc on %s\n", vc);
+        } else {
+                printf(NAME ": Error waiting on %s\n", vc);
+        }
+}
+
+static void mount_data(void)
 {
         int rc;
 
-        printf("Trying to mount null/0 on /scratch... ");
+        printf("Trying to mount disk0 on /data... ");
         fflush(stdout);
 
-        rc = mount("tmpfs", "/scratch", "null/0", "", 0);
+        rc = mount("fat", "/data", "disk0", "wtcache", 0);
         if (rc == EOK)
                 printf("OK\n");
@@ -234 +216 @@
 }
 
-static void mount_data(void)
-{
-        int rc;
-
-        printf("Trying to mount bd/disk0 on /data... ");
-        fflush(stdout);
-
-        rc = mount("fat", "/data", "bd/disk0", "wtcache", 0);
-        if (rc == EOK)
-                printf("OK\n");
-        else
-                printf("Failed\n");
-}
-
 int main(int argc, char *argv[])
 {
@@ -256 +224 @@
                 return -1;
         }
-
-        /* Make sure tmpfs is running. */
-        if (str_cmp(STRING(RDFMT), "tmpfs") != 0) {
-                spawn("/srv/tmpfs");
-        }
         
         spawn("/srv/devfs");
-        spawn("/srv/taskmon");
         
         if (!mount_devfs()) {
@@ -269 +231 @@
                 return -2;
         }
-
-        mount_scratch();
-        
+        
+        spawn("/srv/fb");
+        spawn("/srv/kbd");
+        spawn("/srv/console");
         spawn("/srv/fhc");
         spawn("/srv/obio");
-        srv_start("/srv/cuda_adb");
-        srv_start("/srv/i8042");
-        srv_start("/srv/adb_ms");
-        srv_start("/srv/char_ms");
-
-        spawn("/srv/fb");
-        spawn("/srv/kbd");
-        console("hid_in/kbd");
-        
-        spawn("/srv/clip");
 
         /*
@@ -302 +255 @@
 #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");
-
+        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");
+        
+        usleep(1000000);
+        spawn("/srv/dd");
+        
         return 0;
 }