vbe mode query

[bootcensus] / src / kmain.c

diff --git a/src/kmain.c b/src/kmain.c
index fab4e6f..339d3e0 100644 (file)
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -20,19 +20,13 @@ 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 "int86.h"
+#include "video.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 +34,11 @@ void pcboot_main(void)
 {
        init_segm();
        init_intr();
-       kb_init();
+
        con_init();
+       kb_init();
+
+       init_mem();
 
        /* initialize the timer */
        init_timer();
@@ -55,9 +52,16 @@ 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);