Import backup from 2005-11-03

kernel/display/display.c

@@ -8,7 +8,6 @@
 #include "display.h"
 #include "lang/lang.h"
 #include "kernel.h"
-#include "display/vesafb.h"
 #include "char/keyboard.h"
 #include "display/kout.h"
 
@@ -24,6 +23,7 @@ int display_init()
 	{
 		vconsole_setup(80, 25);
 		display_activate(KERNEL_MSG_CONSOLE);
+		display_type = DISPLAY_CONSOLE;
 	}
 	else
 		display_type = DISPLAY_GRAPHICAL;
@@ -66,8 +66,10 @@ void display_key_event(u32_t keyCode)
 			display_activate(kbdScan - 0x4D);
 			return;
 		}
+		if (KBD_ASCII(keyCode))
+			putc(KBD_ASCII(keyCode));
 	}
-	if (KBD_ASCII(keyCode))
-		putc(KBD_ASCII(keyCode));
+	/* TODO: send key to process on active console
+	          or graphical control process */
 }
 

kernel/display/kout.c

@@ -1,7 +1,7 @@
 // kout.c
 // Author: Josh Holtrop
 // Date: 08/02/04
-// Modified: 03/19/05
+// Modified: 11/02/05
 
 #include "hos_defines.h"
 #include "kout.h"
@@ -21,7 +21,7 @@ void	putc(int c)
 		outportb(0x37a, 0x1);
 		//	char_write(MAJOR_MISC_CHAR, MISC_CHAR_LP0, c);
 #endif
-	char_write(MAJOR_VCONSOLE, KERNEL_MSG_CONSOLE, c);	// write to vconsole with minor 1, first allocated
+	char_write(MAJOR_VCONSOLE, KERNEL_MSG_CONSOLE, c);
 }