Merge branch 'mountpoints' of github.com:Alexis211/Melon into mountpoints

4 files changed, 36 insertions, 11 deletions

diff --git a/Source/Kernel/Core/Log.ns.cpp b/Source/Kernel/Core/Log.ns.cpp
index 1727024..c8ccd80 100644
--- a/Source/Kernel/Core/Log.ns.cpp
+++ b/Source/Kernel/Core/Log.ns.cpp
@@ -1,4 +1,5 @@
 #include "Log.ns.h"
+#include <FileSystems/RamFS/RamFS.class.h>
 #include <VFS/VFS.ns.h>
 
 namespace Log {
@@ -11,6 +12,10 @@ void init(u8int loglevel) {
 	if (VFS::find("/System/Logs") == 0) VFS::createDirectory("/System/Logs");
 
 	logs[KL_PANIC] = new TextFile("/System/Logs/Panic.log", FM_APPEND);
+	if (!logs[KL_PANIC]->valid()) {	//FS maybee not read/write, mount a ramfs
+		RamFS::mount(1024*1024, (DirectoryNode*)VFS::find("/System/Logs"));
+		logs[KL_PANIC] = new TextFile("/System/Logs/Panic.log", FM_APPEND);
+	}
 	if (KL_CRITICAL <= loglevel) logs[KL_CRITICAL] = new TextFile("/System/Logs/Critical.log", FM_APPEND);
 	if (KL_ERROR <= loglevel) logs[KL_ERROR] = new TextFile("/System/Logs/Error.log", FM_APPEND);
 	if (KL_WARNING <= loglevel) logs[KL_WARNING] = new TextFile("/System/Logs/Warning.log", FM_APPEND);
diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp
index eeb92ee..49b2725 100644
--- a/Source/Kernel/Core/Sys.ns.cpp
+++ b/Source/Kernel/Core/Sys.ns.cpp
@@ -83,7 +83,7 @@ void dumpRegs(registers_t *regs, VirtualTerminal& vt) {
 
 void stackTrace(u32int ebp, VirtualTerminal& vt, u32int maxframes) {
 	u32int *stack = (u32int*)ebp;
-	for (u32int i = 0; i < maxframes and (u32int)stack > 0xC0000000; i++) {
+	for (u32int i = 0; i < maxframes and (u32int)stack > 0xC0000000 and (u32int)stack < (ebp + 0x10000); i++) {
 		vt << "Frame: " << (u32int)stack << " n:" << stack[0] << " r:" << stack[1] << "\n";
 		stack = (u32int*)stack[0];
 	}
diff --git a/Source/Kernel/Core/Sys.ns.h b/Source/Kernel/Core/Sys.ns.h
index 4d15676..9b34dbf 100644
--- a/Source/Kernel/Core/Sys.ns.h
+++ b/Source/Kernel/Core/Sys.ns.h
@@ -18,9 +18,12 @@
 
 //This file contains system-relative functions
 class String;
+class SimpleVT;
 class VirtualTerminal;
 struct registers_t;
 
+extern SimpleVT* kvt;
+
 namespace Sys {
 	void outb(u16int port, u8int value);
 	u8int inb(u16int port);
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp
index 0486702..a028457 100644
--- a/Source/Kernel/Core/kmain.wtf.cpp
+++ b/Source/Kernel/Core/kmain.wtf.cpp
@@ -25,6 +25,7 @@
 #include <Rand.ns.h>
 #include <VFS/Part.ns.h>
 #include <FileSystems/RamFS/RamFS.class.h>
+#include <FileSystems/FAT/FATFS.class.h>
 #include <VFS/FileNode.class.h>
 #include <VFS/VFS.ns.h>
 #include <VFS/DirectoryNode.class.h>
@@ -37,6 +38,8 @@ extern u32int end;	//Placement address
 
 extern "C" void kmain(multiboot_info_t* mbd, u32int magic);
 
+SimpleVT* kvt;
+
 u32int logoAnimation(void* p) {
 	SimpleVT& vt = *((SimpleVT*)p);
 	vt.setColor(8);
@@ -83,7 +86,7 @@ u32int logoAnimation(void* p) {
 
 void selectVideoMode(SimpleVT& v) {
 	Disp::getModes();
-	v << "\n\nPlease select a graphic mode in the list below:\n";
+	v << "\nPlease select a graphic mode in the list below:\n";
 
 	for (u32int i = 0; i < Disp::modes.size(); i++) {
 		Disp::mode_t& m = Disp::modes[i];
@@ -140,9 +143,9 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	Disp::setText(vgaout);
 
 	//Create a VT for logging what kernel does
-	SimpleVT *kvt = new ScrollableVT(25, 80, 20, KVT_FGCOLOR, KVT_BGCOLOR);
+	kvt = new ScrollableVT(25, 80, 20, KVT_FGCOLOR, KVT_BGCOLOR);
 	kvt->map(0, 0);
-	*kvt << "Melon is loading...";
+	*kvt << "Melon is loading...\n";
 
 	IDT::init();		//Setup interrupts 
 
@@ -164,13 +167,17 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	//***************************************	PARSE COMMAND LINE
 	
 	Vector<String> opts = kcmdline.split(" ");
-	String keymap = "fr", init = "/System/Applications/PaperWork.app";
+	String keymap = "builtin", init = "/System/Applications/PaperWork.app";
+	String root = "ramfs:0";
+	Vector<String> mount;
 	bool enableVESA = true;
 	for (u32int i = 0; i < opts.size(); i++) {
 		Vector<String> opt = opts[i].split(":");
 		if (opt[0] == "vesa" && opt[1] != "enabled") enableVESA = false;
 		if (opt[0] == "keymap") keymap = opt[1];
 		if (opt[0] == "init") init = opt[1];
+		if (opt[0] == "root") root = opts[i].substr(5);
+		if (opt[0] == "mount") mount.push(opts[i].substr(6));
 	}
 
 	//*************************************** 	DEVICE SETUP
@@ -180,16 +187,26 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	if (enableVESA) Dev::registerDevice(new VESADisplay());
 	FloppyController::detect();
 
-	//***************************************	MOUNT ROOT FILESYSTEM
+	//***************************************	MOUNT FILESYSTEMS
 
-	FileSystem* fs = RamFS::mount((u8int*)mods[0].mod_start, 1024 * 1024, NULL);
+	{	// mount root filesystem
+		if (!VFS::mount(String("/:") += root, kvt, mbd)) PANIC("Cannot mount root filesystem.");
+	}
 	DirectoryNode* cwd;
-	cwd = fs->getRootNode();
+	cwd = VFS::getRootNode();
 	Task::currProcess()->setCwd(cwd);
-	VFS::setRootNode(cwd);
+
+	// mount other filesystems
+	for (u32int i = 0; i < mount.size(); i++) {
+		VFS::mount(mount[i], kvt, mbd);
+	}
+
+	//FATFS::mount(Part::partitions[0], (DirectoryNode*)VFS::createDirectory("/Mount"));
+	
+	//***************************************	LOAD SYSTEM STUFF
 
 	if (keymap != "builtin") {
-		if (!Kbd::loadKeymap(keymap)) *kvt << "\nWARNING : Could not load keymap " << keymap << ", using built-in keymap instead.";
+		if (!Kbd::loadKeymap(keymap)) *kvt << "WARNING : Could not load keymap " << keymap << ", using built-in keymap instead.";
 	}
 
 	Log::init(KL_STATUS);	//Setup logging
@@ -199,7 +216,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 	Log::log(KL_STATUS, "kmain : User list loaded");
 
 	if (init.empty()) {
-		*kvt << "\n\n";
+		*kvt << "\n";
 		new KernelShell(cwd, kvt);
 		while (KernelShell::getInstances() > 0) {
 			Task::currThread()->sleep(100);