X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fkmain.c;h=3c256a65af8960586b0b14262b820c8479df21b8;hb=5e8cc93aaf1173688852acaa0825698c2dc0cb3f;hp=fab4e6f565f91e0091fa4cc6e2db425b31dd34be;hpb=11db15bb0f0f3d23aa9b2966c2f65a0379246813;p=bootcensus

diff --git a/src/kmain.c b/src/kmain.c
index fab4e6f..3c256a6 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -20,19 +20,15 @@ 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 "psaux.h"
 #include "timer.h"
 #include "contty.h"
-#include "int86.h"
+#include "video.h"
+#include "pci.h"
+#include "vbetest.h"
 
-static void set_mode13h(void)
-{
-	struct int86regs regs;
-
-	memset(&regs, 0, sizeof regs);
-	regs.eax = 0x13;
-	int86(0x10, &regs);
-}
 
 void logohack(void);
 
@@ -40,8 +36,14 @@ void pcboot_main(void)
 {
 	init_segm();
 	init_intr();
-	kb_init();
+
 	con_init();
+	kb_init();
+	init_psaux();
+
+	init_mem();
+
+	init_pci();
 
 	/* initialize the timer */
 	init_timer();
@@ -55,18 +57,25 @@ void pcboot_main(void)
 
 		halt_cpu();
 		while((c = kb_getkey()) >= 0) {
-			if(c >= KB_F1 && c <= KB_F12) {
-				set_mode13h();
+			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);
+				printf("key: %d '%c'\n", c, (char)c);
 			} else {
-				printf("key: %d            \n", c);
+				printf("key: %d\n", c);
 			}
 		}
 		if((nticks % 250) == 0) {
-			printf("ticks: %ld\r", nticks);
+			con_printf(71, 0, "[%ld]", nticks);
 		}
 	}
 }