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

diff --git a/src/kmain.c b/src/kmain.c
index 645c87e..3c256a6 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -22,9 +22,11 @@ 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"
 
 
@@ -37,9 +39,12 @@ void pcboot_main(void)
 
 	con_init();
 	kb_init();
+	init_psaux();
 
 	init_mem();
 
+	init_pci();
+
 	/* initialize the timer */
 	init_timer();
 
@@ -60,19 +65,17 @@ void pcboot_main(void)
 				break;
 
 			case KB_F2:
-				set_video_mode(640, 480, 16);
 				vbetest();
-				set_vga_mode(3);
 				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);
 		}
 	}
 }