From: John Hodge <tpg@prelude.mutabah.net>
Date: Wed, 21 Apr 2010 13:11:35 +0000 (+0800)
Subject: Fixed VESA using LogF when not needed, changed VTerm to use VGA, added a kpanic to... 
X-Git-Tag: rel0.06~230
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=61f3375f76620a66b519a0e69d4cdf75aaf5854b;p=tpg%2Facess2.git

Fixed VESA using LogF when not needed, changed VTerm to use VGA, added a kpanic to the keyboard magics
---

diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum
index 96d15cb1..c1adb177 100644
--- a/Kernel/Makefile.BuildNum
+++ b/Kernel/Makefile.BuildNum
@@ -1 +1 @@
-BUILD_NUM = 1946
+BUILD_NUM = 1953
diff --git a/Kernel/drv/kb.c b/Kernel/drv/kb.c
index 6577882c..5e078406 100644
--- a/Kernel/drv/kb.c
+++ b/Kernel/drv/kb.c
@@ -183,6 +183,7 @@ void KB_IRQHandler()
 	{
 		switch(ch)
 		{
+		case 'q':	*((int*)1) = 0;	break;
 		case 'd':	__asm__ __volatile__ ("xchg %bx, %bx");	break;
 		case 'p':	Threads_Dump();	break;
 		}
diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c
index 5c88786b..d0f450b6 100644
--- a/Kernel/drv/vterm.c
+++ b/Kernel/drv/vterm.c
@@ -19,8 +19,8 @@
 #define MAX_INPUT_CHARS32	64
 #define MAX_INPUT_CHARS8	(MAX_INPUT_CHARS32*4)
 #define VT_SCROLLBACK	2	// 2 Screens of text
-//#define DEFAULT_OUTPUT	"VGA"
-#define DEFAULT_OUTPUT	"BochsGA"
+#define DEFAULT_OUTPUT	"VGA"
+//#define DEFAULT_OUTPUT	"BochsGA"
 //#define DEFAULT_OUTPUT	"Vesa"
 #define DEFAULT_INPUT	"PS2Keyboard"
 #define	DEFAULT_WIDTH	80
diff --git a/Modules/Display/VESA/main.c b/Modules/Display/VESA/main.c
index 47bcf63b..1d803fb5 100644
--- a/Modules/Display/VESA/main.c
+++ b/Modules/Display/VESA/main.c
@@ -133,7 +133,7 @@ int Vesa_Install(char **Arguments)
 Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer)
 {
 	#if DEBUG >= 2
-	LogF("Vesa_Read: () - NULL\n");
+	Log("Vesa_Read: () - NULL\n");
 	#endif
 	return 0;
 }
@@ -317,7 +317,7 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
 int Vesa_Int_SetMode(int mode)
 {	
 	#if DEBUG
-	LogF("Vesa_Int_SetMode: (mode=%i)\n", mode);
+	Log("Vesa_Int_SetMode: (mode=%i)", mode);
 	#endif
 	
 	// Sanity Check values
@@ -343,8 +343,8 @@ int Vesa_Int_SetMode(int mode)
 	giVesaPageCount = (gVesa_Modes[mode].fbSize + 0xFFF) >> 12;
 	gVesaFramebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);
 	
-	LogF("Vesa", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);
-	LogF("Vesa", "Framebuffer (Virt) = 0x%x", gVesaFramebuffer);
+	Log("Vesa", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);
+	Log("Vesa", "Framebuffer (Virt) = 0x%x", gVesaFramebuffer);
 	
 	// Record Mode Set
 	giVesaCurrentMode = mode;