git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup and Bugfixes
[tpg/acess2.git]
/
Kernel
/
system.c
diff --git
a/Kernel/system.c
b/Kernel/system.c
index
27c3502
..
af66851
100644
(file)
--- a/
Kernel/system.c
+++ b/
Kernel/system.c
@@
-10,6
+10,7
@@
extern int Modules_LoadBuiltins();
extern int PCI_Install();
extern void DMA_Install();
extern void Debug_SetKTerminal(char *File);
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);
// === PROTOTYPES ===
void System_Init(char *ArgString);
@@
-26,12
+27,16
@@
char *gsConfigScript = "/Acess/Conf/BootConf.cfg";
void System_Init(char *ArgString)
{
// - Start Builtin Drivers & Filesystems
void System_Init(char *ArgString)
{
// - Start Builtin Drivers & Filesystems
+ StartupPrint("Scanning PCI Bus...");
PCI_Install();
PCI_Install();
+ StartupPrint("Loading DMA...");
DMA_Install();
DMA_Install();
+ StartupPrint("Loading staticly compiled modules...");
Modules_LoadBuiltins();
// Set the debug to be echoed to the terminal
Modules_LoadBuiltins();
// Set the debug to be echoed to the terminal
- Debug_SetKTerminal("/Devices/vterm/0");
+ StartupPrint("Kernel now echoes to VT6 (Ctrl-Alt-F7)");
+ Debug_SetKTerminal("/Devices/VTerm/6");
// - Parse Kernel's Command Line
System_ParseCommandLine(ArgString);
// - Parse Kernel's Command Line
System_ParseCommandLine(ArgString);
@@
-247,7
+252,7
@@
void System_ExecuteScript()
i += 7;
i += System_Int_GetString(fData+i, &sArg1);
if(!sArg1) goto read2eol;
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
Module_LoadFile(sArg1, "");
}
// - Symlink
@@
-257,7
+262,7
@@
void System_ExecuteScript()
if(!sArg1) goto read2eol;
i += System_Int_GetString(fData+i, &sArg2);
if(!sArg2) goto read2eol;
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
VFS_Symlink(sArg1, sArg2);
}
// - New Directory
@@
-265,7
+270,7
@@
void System_ExecuteScript()
i += 6;
i += System_Int_GetString(fData+i, &sArg1);
if(!sArg1) goto read2eol;
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
VFS_MkDir(sArg1);
}
// - Spawn a task
@@
-273,7
+278,7
@@
void System_ExecuteScript()
i += 6;
i += System_Int_GetString(fData+i, &sArg1);
if(!sArg1) goto read2eol;
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 {
Proc_Spawn(sArg1);
}
else {
UCC
git Repository :: git.ucc.asn.au