Fixed VESA using LogF when not needed, changed VTerm to use VGA, added a kpanic to...

diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum
index 96d15cb..c1adb17 100644 (file)
--- 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 6577882..5e07840 100644 (file)
--- 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 5c88786..d0f450b 100644 (file)
--- 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 47bcf63..1d803fb 100644 (file)
--- 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)\r
 {\r
        #if DEBUG >= 2\r
-       LogF("Vesa_Read: () - NULL\n");\r
+       Log("Vesa_Read: () - NULL\n");\r
        #endif\r
        return 0;\r
 }\r
@@ -317,7 +317,7 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
 int Vesa_Int_SetMode(int mode)\r
 {      \r
        #if DEBUG\r
-       LogF("Vesa_Int_SetMode: (mode=%i)\n", mode);\r
+       Log("Vesa_Int_SetMode: (mode=%i)", mode);\r
        #endif\r
        \r
        // Sanity Check values\r
@@ -343,8 +343,8 @@ int Vesa_Int_SetMode(int mode)
        giVesaPageCount = (gVesa_Modes[mode].fbSize + 0xFFF) >> 12;\r
        gVesaFramebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);\r
        \r
-       LogF("Vesa", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);\r
-       LogF("Vesa", "Framebuffer (Virt) = 0x%x", gVesaFramebuffer);\r
+       Log("Vesa", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);\r
+       Log("Vesa", "Framebuffer (Virt) = 0x%x", gVesaFramebuffer);\r
        \r
        // Record Mode Set\r
        giVesaCurrentMode = mode;\r