Cleanup and Bugfixes

[tpg/acess2.git] / Kernel / system.c

diff --git a/Kernel/system.c b/Kernel/system.c
index 26ce100..af66851 100644 (file)
--- a/Kernel/system.c
+++ b/Kernel/system.c
@@ -9,6 +9,8 @@
 extern int     Modules_LoadBuiltins();
 extern int     PCI_Install();
 extern void    DMA_Install();
+extern void    Debug_SetKTerminal(char *File);
+extern void    StartupPrint(char *Str);
 
 // === PROTOTYPES ===
 void   System_Init(char *ArgString);
@@ -19,17 +21,23 @@ void        System_ExecuteScript();
  int   System_Int_GetString(char *Str, char **Dest);
 
 // === GLOBALS ===
-char   *gsInitPath = "/Acess/Bin/init";
 char   *gsConfigScript = "/Acess/Conf/BootConf.cfg";
 
 // === CODE ===
 void System_Init(char *ArgString)
 {
        // - Start Builtin Drivers & Filesystems
+       StartupPrint("Scanning PCI Bus...");
        PCI_Install();
+       StartupPrint("Loading DMA...");
        DMA_Install();
+       StartupPrint("Loading staticly compiled modules...");
        Modules_LoadBuiltins();
        
+       // Set the debug to be echoed to the terminal
+       StartupPrint("Kernel now echoes to VT6 (Ctrl-Alt-F7)");
+       Debug_SetKTerminal("/Devices/VTerm/6");
+       
        // - Parse Kernel's Command Line
        System_ParseCommandLine(ArgString);
        
@@ -233,10 +241,10 @@ void System_ExecuteScript()
                }
                // - Load Module
                else if(strncmp("module ", fData+i, 6) == 0) {
+                       //char  *tmp;
                        i += 7;
                        i += System_Int_GetString(fData+i, &sArg1);
                        if(!sArg1)      goto read2eol;
-                       //Log("[CFG ] Load Module '%s'\n", sArg1);
                        Module_LoadFile(sArg1, "");     //!\todo Use the rest of the line as the argument string
                }
                // - Load Module
@@ -244,7 +252,7 @@ void System_ExecuteScript()
                        i += 7;
                        i += System_Int_GetString(fData+i, &sArg1);
                        if(!sArg1)      goto read2eol;
-                       Log("[CFG ] Load EDI Module '%s'\n", sArg1);
+                       Log("[CFG  ] Load EDI Module '%s'", sArg1);
                        Module_LoadFile(sArg1, "");
                }
                // - Symlink
@@ -254,7 +262,7 @@ void System_ExecuteScript()
                        if(!sArg1)      goto read2eol;
                        i += System_Int_GetString(fData+i, &sArg2);
                        if(!sArg2)      goto read2eol;
-                       Log("[CFG ] Symlink '%s' pointing to '%s'\n", sArg1, sArg2);
+                       Log("[CFG  ] Symlink '%s' pointing to '%s'", sArg1, sArg2);
                        VFS_Symlink(sArg1, sArg2);
                }
                // - New Directory
@@ -262,7 +270,7 @@ void System_ExecuteScript()
                        i += 6;
                        i += System_Int_GetString(fData+i, &sArg1);
                        if(!sArg1)      goto read2eol;
-                       Log("[CFG ] New Directory '%s'\n", sArg1);
+                       Log("[CFG  ] New Directory '%s'", sArg1);
                        VFS_MkDir(sArg1);
                }
                // - Spawn a task
@@ -270,7 +278,7 @@ void System_ExecuteScript()
                        i += 6;
                        i += System_Int_GetString(fData+i, &sArg1);
                        if(!sArg1)      goto read2eol;
-                       Log("[CFG ] Starting '%s' as a new task\n", sArg1);
+                       Log("[CFG  ] Starting '%s' as a new task", sArg1);
                        Proc_Spawn(sArg1);
                }
                else {