Changeset 36b8100a in mainline

Timestamp:

2009-06-03T19:29:18Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

73878c1

Parents:

595edf5

Message:

init rewrite: remove banner, start getvc to acquire first seven virtual terminals

Location:

uspace/app/init

Files:

• Makefile (modified) (3 diffs)
• init.c (modified) (3 diffs)
• init.h (modified) (3 diffs)
• version.c (deleted)
• version.h (deleted)

uspace/app/init/Makefile

@@ -27 +27 @@
 #
 
-include ../../../version
-
 ## Setup toolchain
 #
@@ -37 +35 @@
 include $(LIBC_PREFIX)/Makefile.toolchain
 
-CFLAGS += -I../../srv/kbd/include
-
 LIBS = $(LIBC_PREFIX)/libc.a
-DEFS += -DRELEASE=$(RELEASE)
 
 ## Sources
@@ -47 +42 @@
 OUTPUT = init
 SOURCES = \
-        init.c \
-        version.c
+        init.c
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

uspace/app/init/init.c

@@ -45 +45 @@
 #include <malloc.h>
 #include <macros.h>
-#include <console.h>
 #include <string.h>
+#include <devmap.h>
 #include "init.h"
-#include "version.h"
 
-static bool mount_fs(const char *fstype)
+static void info_print(void)
+{
+        printf(NAME ": HelenOS init\n");
+}
+
+static bool mount_root(const char *fstype)
 {
         int rc = -1;
@@ -119 +123 @@
 }
 
+static void getvc(char *dev, char *app)
+{
+        char *argv[4];
+        char vc[MAX_DEVICE_NAME];
+        
+        snprintf(vc, MAX_DEVICE_NAME, "/dev/%s", dev);
+        
+        printf(NAME ": Spawning getvc on %s\n", vc);
+        
+        dev_handle_t handle;
+        devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
+        
+        if (handle >= 0) {
+                argv[0] = "/app/getvc";
+                argv[1] = vc;
+                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);
+}
+
 int main(int argc, char *argv[])
 {
         info_print();
         
-        if (!mount_fs(STRING(RDFMT))) {
+        if (!mount_root(STRING(RDFMT))) {
                 printf(NAME ": Exiting\n");
                 return -1;
@@ -141 +169 @@
         spawn("/srv/obio");
         
-        console_wait();
-        version_print();
-        
-        spawn("/app/klog");
-        spawn("/app/bdsh");
+        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");
         
         return 0;

uspace/app/init/init.h

@@ -29 +29 @@
 /** @addtogroup init
  * @{
- */ 
+ */
 /**
  * @file
@@ -37 +37 @@
 #define __INIT_H__
 
-#define NAME "init"
+#define NAME  "init"
+
+#define MAX_DEVICE_NAME  32
 
 #endif
@@ -43 +45 @@
 /** @}
  */
-