From 6055ef45a39b62bffa5f4c194e5d62a177c3b9df Mon Sep 17 00:00:00 2001
From: Alexis211 <alexis211@gmail.com>
Date: Sat, 14 Nov 2009 13:35:41 +0100
Subject: Added screenshots and a grub entry for the GOL simulator.

---
 Source/Kernel/Config.h                    | 11 ++++-------
 Source/Kernel/Core/Sys.ns.cpp             |  2 +-
 Source/Kernel/Core/kmain.wtf.cpp          |  4 ++--
 Source/Kernel/Shell/KernelShell.class.cpp |  8 ++++----
 4 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'Source')

diff --git a/Source/Kernel/Config.h b/Source/Kernel/Config.h
index 149f699..009b133 100644
--- a/Source/Kernel/Config.h
+++ b/Source/Kernel/Config.h
@@ -8,13 +8,10 @@
 #define TXTLOGO_BGCOLOR 0
 #define KVT_FGCOLOR 7
 #define KVT_BGCOLOR 0
-#define KVT_OKCOLOR 2
-#define KVT_BLECOLOR 4	//BLE = Boot Log Entry
-#define KVT_LIGHTCOLOR 8
+#define KVT_LIGHTCOLOR 6
+#define KVT_ENTRYCOLOR 15
 
-#define SHELL_FGCOLOR 7
-#define SHELL_BGCOLOR 0
-#define SHELL_LIGHTCOLOR 6
-#define SHELL_ENTRYCOLOR 15
+#define SHELL_FGCOLOR 0
+#define SHELL_BGCOLOR 7
 
 #endif
diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp
index 5d4a1ab..1b59f7f 100644
--- a/Source/Kernel/Core/Sys.ns.cpp
+++ b/Source/Kernel/Core/Sys.ns.cpp
@@ -147,7 +147,7 @@ void halt() {
 	SimpleVT vt(3, message.size() + 16, 7, 6);
 	vt.map();
 	vt << "\n\t" << message;
-	while (1) asm volatile("cli");
+	while (1) asm volatile("cli; hlt");
 }
 
 u32int scall(u8int wat, u32int a, u32int b, u32int c, u32int d) {
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp
index d812c9a..b6543ae 100644
--- a/Source/Kernel/Core/kmain.wtf.cpp
+++ b/Source/Kernel/Core/kmain.wtf.cpp
@@ -175,10 +175,10 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
 
 	//*************************************** 	DEVICE SETUP
 
-	if (enableVESA) Dev::registerDevice(new VESADisplay());
-	FloppyController::detect();
 	Dev::registerDevice(new PS2Keyboard());	//Initialize keyboard driver
 	Kbd::setFocus(kvt);	//Set focus to virtual terminal
+	if (enableVESA) Dev::registerDevice(new VESADisplay());
+	FloppyController::detect();
 
 	//***************************************	MOUNT ROOT FILESYSTEM
 
diff --git a/Source/Kernel/Shell/KernelShell.class.cpp b/Source/Kernel/Shell/KernelShell.class.cpp
index b6898ba..f3cd340 100644
--- a/Source/Kernel/Shell/KernelShell.class.cpp
+++ b/Source/Kernel/Shell/KernelShell.class.cpp
@@ -31,7 +31,7 @@ KernelShell::KernelShell(DirectoryNode* cwd, VirtualTerminal* vt) {
 }
 
 KernelShell::KernelShell(DirectoryNode* cwd) {
-	ScrollableVT* vt = new ScrollableVT(15, 76, 200, SHELL_FGCOLOR, SHELL_BGCOLOR);
+	ScrollableVT* vt = new ScrollableVT(15, 76, 200, KVT_FGCOLOR, KVT_BGCOLOR);
 	vt->map(9);
 	setup(cwd, vt);
 }
@@ -65,11 +65,11 @@ u32int KernelShell::run() {
 	};
 	
 	while (1) {
-		m_vt->setColor(SHELL_LIGHTCOLOR);
+		m_vt->setColor(KVT_LIGHTCOLOR);
 		*m_vt << VFS::path(m_cwd) << " # ";
-		m_vt->setColor(SHELL_ENTRYCOLOR);
+		m_vt->setColor(KVT_ENTRYCOLOR);
 		Vector<String> tokens = m_vt->readLine().split(" ");
-		m_vt->setColor(SHELL_FGCOLOR);
+		m_vt->setColor(KVT_FGCOLOR);
 		if (tokens[0] == "help") {
 			*m_vt << " - Command list for integrated kernel shell:\n";
 			*m_vt << "  - help       shows this help screen\n";
-- 
cgit v1.2.3