Changeset 860271d4 in mainline

Timestamp:

2008-06-03T15:12:08Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

78d0da8

Parents:

6a7f6b8

Message:

use common devmap.h

Location:

uspace/app

Files:

• init/init.c (modified) (2 diffs)
• init/init.h (modified) (1 diff)
• init/version.c (modified) (2 diffs)
• init/version.h (modified) (1 diff)
• tester/devmap/devmap1.c (modified) (1 diff)

uspace/app/init/init.c

@@ -35 +35 @@
  */
 
+#include <stdio.h>
+#include <unistd.h>
+#include <vfs/vfs.h>
+#include <bool.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <task.h>
+#include <malloc.h>
+#include "init.h"
 #include "version.h"
-#include <stdio.h>
 
-static void test_console(void)
+#define BUF_SIZE 150000
+
+static char *buf;
+
+static void console_wait(void)
 {
-        int c;
+        while (get_cons_phone() < 0)
+                usleep(50000);  // FIXME
+}
 
-        while ((c = getchar()) != EOF)
-                putchar(c);
+static bool mount_tmpfs(void)
+{
+        int rc = -1;
+        
+        while (rc < 0) {
+                rc = mount("tmpfs", "/", "initrd");
+                
+                switch (rc) {
+                case EOK:
+                        printf(NAME ": Root filesystem mounted\n");
+                        break;
+                case EBUSY:
+                        printf(NAME ": Root filesystem already mounted\n");
+                        break;
+                case ELIMIT:
+                        printf(NAME ": Unable to mount root filesystem\n");
+                        return false;
+                default:
+                        sleep(5);       // FIXME
+                }
+        }
+        
+        return true;
+}
+
+static void spawn(char *fname)
+{
+        printf(NAME ": Spawning %s\n", fname);
+        
+        int fd = open(fname, O_RDONLY);
+        if (fd >= 0) {
+        
+                ssize_t rd;
+                size_t len = 0;
+                
+                // FIXME: cannot do long reads yet
+                do {
+                        rd = read(fd, buf + len, 1024);
+                        if (rd > 0)
+                                len += rd;
+                        
+                } while (rd > 0);
+                
+                if (len > 0) {
+                        task_spawn(buf, len);
+                        sleep(1);       // FIXME
+                }
+                
+                close(fd);
+        }
 }
 
 int main(int argc, char *argv[])
 {
+        info_print();
+        sleep(5);       // FIXME
+        
+        if (!mount_tmpfs()) {
+                printf(NAME ": Exiting\n");
+                return -1;
+        }
+        
+        buf = malloc(BUF_SIZE);
+        
+        // FIXME: spawn("/sbin/pci");
+        spawn("/sbin/fb");
+        spawn("/sbin/kbd");
+        spawn("/sbin/console");
+        
+        console_wait();
         version_print();
-
-        printf("This is init\n");
         
-        test_console();
-
-        printf("\nBye.\n");
-
+        spawn("/sbin/fat");
+        spawn("/sbin/tetris");
+        // FIXME: spawn("/sbin/tester");
+        // FIXME: spawn("/sbin/klog");
+        
+        free(buf);
         return 0;
 }
@@ -61 +139 @@
 /** @}
  */
-

uspace/app/init/init.h

@@ -37 +37 @@
 #define __INIT_H__
 
-#include "version.h"
+#define NAME "init"
 
 #endif

uspace/app/init/version.c

@@ -36 +36 @@
 #include <unistd.h>
 #include <stdio.h>
+#include "init.h"
 #include "version.h"
 
@@ -52 +53 @@
 #endif
 
+void info_print(void)
+{
+        printf(NAME ": HelenOS init\n");
+}
+
 /** Print version information. */
 void version_print(void)

uspace/app/init/version.h

@@ -37 +37 @@
 #define __VERSION_H__
 
+extern void info_print(void);
 extern void version_print(void);
 

uspace/app/tester/devmap/devmap1.c

@@ -33 +33 @@
 #include <async.h>
 #include <errno.h>
-#include <../../../srv/devmap/devmap.h>
+#include <ipc/devmap.h>
 #include "../tester.h"