X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fkmain.c;h=8af7cc37fa4a090d90b9a4d74f0db3d98a78eea3;hb=e253f9a0cad14f636a51f6211308491ab19dfbe5;hp=e0d135844182e7ea8a7c8468eb88ff1bd4936c44;hpb=395502ec9dab0fda04bacb223f1fecdbbbdbe1b7;p=bootcensus

diff --git a/src/kmain.c b/src/kmain.c
index e0d1358..8af7cc3 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -22,9 +22,13 @@ 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 "audio.h"
+#include "pci.h"
+#include "vbetest.h"
 
 
 void logohack(void);
@@ -36,12 +40,17 @@ void pcboot_main(void)
 
 	con_init();
 	kb_init();
+	init_psaux();
 
 	init_mem();
 
+	init_pci();
+
 	/* initialize the timer */
 	init_timer();
 
+	audio_init();
+
 	enable_intr();
 
 	printf("PCBoot kernel initialized\n");
@@ -59,19 +68,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);
 		}
 	}
 }