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
Fixed VESA scrolling bug
[tpg/acess2.git]
/
Kernel
/
system.c
diff --git
a/Kernel/system.c
b/Kernel/system.c
index
a720add
..
546b2d8
100644
(file)
--- a/
Kernel/system.c
+++ b/
Kernel/system.c
@@
-67,10
+67,7
@@
char *gsConfigScript = "/Acess/Conf/BootConf.cfg";
// === CODE ===
void System_Init(char *ArgString)
// === CODE ===
void System_Init(char *ArgString)
-{
- // Set the debug to be echoed to the terminal
- StartupPrint("Kernel now echoes to VT7 (Ctrl-Alt-F8)");
- Debug_SetKTerminal("/Devices/VTerm/7");
+{
// - Parse Kernel's Command Line
System_ParseCommandLine(ArgString);
// - Parse Kernel's Command Line
System_ParseCommandLine(ArgString);
@@
-78,6
+75,10
@@
void System_Init(char *ArgString)
// - Execute the Config Script
Log_Log("Config", "Executing config script...");
System_ExecuteScript();
// - Execute the Config Script
Log_Log("Config", "Executing config script...");
System_ExecuteScript();
+
+ // Set the debug to be echoed to the terminal
+ Log_Log("Config", "Kernel now echoes to VT7 (Ctrl-Alt-F8)");
+ Debug_SetKTerminal("/Devices/VTerm/7");
}
/**
}
/**
@@
-206,7
+207,10
@@
void System_ParseSetting(char *Arg)
if(strcmp(Arg, "SCRIPT") == 0) {
Log_Log("Config", "Config Script: '%s'", value);
if(strcmp(Arg, "SCRIPT") == 0) {
Log_Log("Config", "Config Script: '%s'", value);
- gsConfigScript = value;
+ if(strlen(value) == 0)
+ gsConfigScript = NULL;
+ else
+ gsConfigScript = value;
} else {
Log_Warning("Config", "Kernel config setting '%s' is not recognised", Arg);
}
} else {
Log_Warning("Config", "Kernel config setting '%s' is not recognised", Arg);
}
UCC
git Repository :: git.ucc.asn.au