added PS/2 mouse code

[bootcensus] / src / kmain.c

diff --git a/src/kmain.c b/src/kmain.c
index d008217..3c256a6 100644 (file)
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -22,9 +22,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "intr.h"
 #include "mem.h"
 #include "keyb.h"
+#include "psaux.h"
 #include "timer.h"
 #include "contty.h"
 #include "video.h"
+#include "pci.h"
+#include "vbetest.h"
 
 
 void logohack(void);
@@ -36,9 +39,12 @@ void pcboot_main(void)
 
        con_init();
        kb_init();
+       init_psaux();
 
        init_mem();
 
+       init_pci();
+
        /* initialize the timer */
        init_timer();
 
@@ -51,19 +57,25 @@ 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);
+                               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);
                }
        }
 }