Various Changes

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

diff --git a/Kernel/system.c b/Kernel/system.c
index a736c46..4dc92c8 100644 (file)
--- a/Kernel/system.c
+++ b/Kernel/system.c
@@ -8,6 +8,7 @@
 // === IMPORTS ===
 extern int     Modules_LoadBuiltins();
 extern int     PCI_Install();
+extern void    DMA_Install();
 
 // === PROTOTYPES ===
 void   System_Init(char *ArgString);
@@ -18,15 +19,14 @@ void        System_ExecuteScript();
  int   System_Int_GetString(char *Str, char **Dest);
 
 // === GLOBALS ===
-char   *gsInitPath = "/Acess/Bin/init";
-char   *gsConfigScript = "/Acess/BootConf.cfg";
+char   *gsConfigScript = "/Acess/Conf/BootConf.cfg";
 
 // === CODE ===
 void System_Init(char *ArgString)
 {
        // - Start Builtin Drivers & Filesystems
        PCI_Install();
-       //ATA_Install();
+       DMA_Install();
        Modules_LoadBuiltins();
        
        // - Parse Kernel's Command Line
@@ -232,10 +232,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