From f36a96b59eddd066354018c4e6c6279897b33487 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Thu, 4 Feb 2010 23:07:25 +0100 Subject: Added framebuffer. Output is now to a framebuffer instead of serial console. --- kernel/main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'kernel/main.c') diff --git a/kernel/main.c b/kernel/main.c index d6de534..e5695b6 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -1,4 +1,5 @@ #include "kernel.h" +#include "framebuffer.h" #include "printf.h" #include "palloc.h" #include "paging.h" @@ -6,15 +7,17 @@ #include "idt.h" #include "irq.h" +#include "portio.h" + void main() { + paging_reinit(); + + framebuffer_init(); printf("main()\n"); palloc_init(); printf("Page allocator initiated.\n"); - paging_reinit(); - printf("Paging reinitialized.\n"); - gdt_init(); printf("GDT set.\n"); -- cgit v1.2.3