summaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-02-04 23:07:25 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-02-04 23:07:25 +0100
commitf36a96b59eddd066354018c4e6c6279897b33487 (patch)
tree3a55ab20f7e9f91e1131d0fa6873c0b92393af7f /kernel/main.c
parent4b0929187b70588bcebfe004ab216f3590c01038 (diff)
Added framebuffer.
Output is now to a framebuffer instead of serial console.
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c9
1 files changed, 6 insertions, 3 deletions
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");