1 files changed, 19 insertions, 42 deletions

diff --git a/src/sys/init/init_main.C b/src/sys/init/init_main.C
index dd83ea131..5a7cf16ae 100644
--- a/src/sys/init/init_main.C
+++ b/src/sys/init/init_main.C
@@ -7,62 +7,39 @@
 #include <sys/sync.h>
 #include <sys/msg.h>
 #include <sys/mmio.h>
+#include <assert.h>
 
-mutex_t global_mutex = MUTEX_INITIALIZER;
-
-/*
-void init_child(void* unused)
-{
-    mutex_lock(&global_mutex);
-    printk("Crun: %d on %d\n", task_gettid(), task_getcpuid());
-    mutex_unlock(&global_mutex);
-    for (volatile int i = 0 ; i < 100000; i++);
-    task_end();
-}
-*/
 
 void vfs_main(void*);
 
 void init_main(void* unused)
 {
-    printk("Starting init!\n");
-    
-    printk("Bringing up VFS..."); 
-    task_create(&vfs_main, NULL);
-    
-    // TODO... add a barrier to ensure VFS is fully up.
-    while (NULL == _syscall0(Systemcalls::MSGQ_RESOLVE_ROOT))
-	task_yield(); 
-
+    tid_t   tidrc   =   0;
 
-/* 
-    uint64_t* mmio_addr = (uint64_t*) mmio_map((void*)0x800000000, 1);
-    printk("MMIO Access %lx\n", *mmio_addr);
+    printk("Starting init!\n");
 
-    msg_q_t msgq = msg_q_create();
-    msg_q_register(msgq, "/msg/init");
+    printk("Bringing up VFS...");
+    task_create( &vfs_main, NULL );
 
-    msg_t* msg = msg_allocate();
-    msg->type = 1; msg->data[0] = 0xDEADBEEF12345678;
-    msg_send(msgq, msg);
-    msg = msg_wait(msgq);
+    // TODO... add a barrier to ensure VFS is fully up.
+    while (NULL == _syscall0(Systemcalls::MSGQ_RESOLVE_ROOT))
+        task_yield();
 
-    printk("Got Message: %lx\n", msg->data[0]);
 
-    while(1)
+    //  run initialization service to start up everything else.
+    printk("init_main: Starting Initialization Service...\n");
+    tidrc   =   task_exec( "libinitservice.so", NULL );
+    if ( (int16_t)tidrc < 0 )       //  task_exec returned a -1
     {
-	mutex_lock(&global_mutex);
-	int t = task_create(&init_child, NULL);
-	printk("Create child %d\n", t);
-	for (volatile int i = 0 ; i < 1000000; i++);
-	mutex_unlock(&global_mutex);
+        printk( "ERROR: init_main: failed to launch initservice: %d\n", tidrc );
+
+        assert( 0 );        // stop here.
     }
-*/
 
-    task_exec("libexample.so", NULL);
+    // should never reach this point...
+    task_end();
+
 
-    task_exec("libcxxtest.so", NULL);
-    
     while(1)
-	task_yield();
+        task_yield();
 }