X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fkmain.c;h=8e4eba4fe775d5dc2461387dc2cffe74a379f90b;hb=bd35c984636a2d5dfdff7a80f8eaa4e388c6899c;hp=2404033f70121371f2f8d8f2342afc0ad5dca114;hpb=c5698ff9776ac76cd2243525177c35b0d12855e0;p=bootcensus

diff --git a/src/kmain.c b/src/kmain.c
index 2404033..8e4eba4 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 "audio.h"
 #include "pci.h"
 #include "vbetest.h"
 
@@ -38,6 +40,7 @@ void pcboot_main(void)
 
 	con_init();
 	kb_init();
+	init_psaux();
 
 	init_mem();
 
@@ -46,6 +49,8 @@ void pcboot_main(void)
 	/* initialize the timer */
 	init_timer();
 
+	init_audio();
+
 	enable_intr();
 
 	printf("PCBoot kernel initialized\n");
@@ -67,13 +72,13 @@ void pcboot_main(void)
 				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);
 		}
 	}
 }