diff options
author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-01-09 21:23:16 +0100 |
---|---|---|
committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-01-09 21:23:16 +0100 |
commit | e44ad9e6463db78c3f1df8f4dbff0cbf343ca49f (patch) | |
tree | 0159df1baf35897995995d68bba43020fc567125 /kernel/main.c | |
parent | 51a6ac67b761182d67eeb2f625d8476a2e79e632 (diff) |
Added printf().
Diffstat (limited to 'kernel/main.c')
-rw-r--r-- | kernel/main.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/kernel/main.c b/kernel/main.c index cc0dc35..55476ce 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -1,19 +1,17 @@ +#include "printf.h" #include "gdt.h" #include "idt.h" -void kernel_serial_out(char* str); - void main() { - - kernel_serial_out("main()\n"); + printf("main()\n"); gdt_init(); - kernel_serial_out("GDT set.\n"); + printf("GDT set.\n"); idt_init(); - kernel_serial_out("IDT set.\n"); + printf("IDT set.\n"); - kernel_serial_out("Halting.\n"); + printf("Halting.\n"); asm volatile( "cli\n" @@ -21,14 +19,3 @@ void main() { ); while(1); } - -#define outb(port, value) asm volatile("out %b0,%w1" : : "a" (value), "d" (port)); - -void kernel_serial_out(char* str) { - while(*str) { - if(*str == '\n') { - outb(0x3f8, '\r'); - } - outb(0x3f8, *str++); - } -} |