X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fkmain.c;h=339d3e0e5bef9b9b53a9a9f07ed966450707a970;hb=094e9170ca5f9b59443c171967cdc78f1c07044c;hp=0ffc152bd71719a8a21284f543ae6e5d379fc345;hpb=91fc6b749ad3a64c9a2686952eb30be517c6beb9;p=bootcensus

diff --git a/src/kmain.c b/src/kmain.c
index 0ffc152..339d3e0 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -20,10 +20,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <ctype.h>
 #include "segm.h"
 #include "intr.h"
+#include "mem.h"
 #include "keyb.h"
 #include "timer.h"
 #include "contty.h"
 #include "video.h"
+#include "vbetest.h"
 
 
 void logohack(void);
@@ -32,8 +34,11 @@ void pcboot_main(void)
 {
 	init_segm();
 	init_intr();
-	kb_init();
+
 	con_init();
+	kb_init();
+
+	init_mem();
 
 	/* initialize the timer */
 	init_timer();
@@ -47,10 +52,16 @@ void pcboot_main(void)
 
 		halt_cpu();
 		while((c = kb_getkey()) >= 0) {
-			if(c >= KB_F1 && c <= KB_F12) {
+			switch(c) {
+			case KB_F1:
 				set_vga_mode(0x13);
 				logohack();
 				set_vga_mode(3);
+				break;
+
+			case KB_F2:
+				vbetest();
+				break;
 			}
 			if(isprint(c)) {
 				printf("key: %d '%c'       \n", c, (char)c);