X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=src%2Fkmain.c;h=d00821771ca3fcb2aeffeaee7d9815d1579e9a16;hp=0ffc152bd71719a8a21284f543ae6e5d379fc345;hb=79be435fcf61613617025a2c4ef5fddf00a09178;hpb=5a961b914da78d534e8e2dc6bfb5103114dbff54 diff --git a/src/kmain.c b/src/kmain.c index 0ffc152..d008217 100644 --- a/src/kmain.c +++ b/src/kmain.c @@ -20,6 +20,7 @@ along with this program. If not, see . #include #include "segm.h" #include "intr.h" +#include "mem.h" #include "keyb.h" #include "timer.h" #include "contty.h" @@ -32,8 +33,11 @@ void pcboot_main(void) { init_segm(); init_intr(); - kb_init(); + con_init(); + kb_init(); + + init_mem(); /* initialize the timer */ init_timer();