build multiple disk images, and console to vid & serial

[eightysix] / kern / src / main.c

diff --git a/kern/src/main.c b/kern/src/main.c
index 1ca879b..088bfb2 100644 (file)
--- a/kern/src/main.c
+++ b/kern/src/main.c
@@ -1,13 +1,27 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <malloc.h>
+#include "intr.h"
+#include "vid.h"
+#include "ser.h"
+#include "con.h"
+#include "mem.h"
+#include "proc.h"
+#include "dbg.h"
+
 void kmain(void)
 {
-       int i, j;
-       unsigned short __far *vmem = (void __far*)0xb8000000ul;
-       unsigned short c;
-
-       for(i=0; i<25; i++) {
-               c = ((i & 0xf) << 8) | '@';
-               for(j=0; j<80; j++) {
-                       *vmem++ = c;
-               }
-       }
+       vid_init();
+       ser_init();
+       con_init();
+
+       printf("eightysix kernel %s\n", VERSTR);
+
+       mem_init();
+       init_intr();
+
+       printf("starting init\n");
+       proc_init();
 }