diff --git a/src/kernel/drivers/vga.c b/src/kernel/drivers/vga.c index fc057f9..41a9e23 100644 --- a/src/kernel/drivers/vga.c +++ b/src/kernel/drivers/vga.c @@ -65,7 +65,7 @@ int print_char(char c, int x, int y){ return offset; } -void print_string_at(char *str, int x, int y){ +void puts_at(char *str, int x, int y){ int offset; if(x >= 0 && y >= 0){ offset = y*VGA_WIDTH+x; @@ -112,6 +112,6 @@ void print_string_at(char *str, int x, int y){ } } -void print_string(char *str){ - print_string_at(str, -1, -1); +void puts(char *str){ + puts_at(str, -1, -1); } diff --git a/src/kernel/drivers/vga.h b/src/kernel/drivers/vga.h index 0f5ec18..a24494f 100644 --- a/src/kernel/drivers/vga.h +++ b/src/kernel/drivers/vga.h @@ -51,5 +51,5 @@ void set_color(int x, int y, uint8_t color); void set_cursor(int offset); int get_cursor(); int print_char(char c, int x, int y); -void print_string_at(char *str, int x, int y); -void print_string(char *str); +void puts_at(char *str, int x, int y); +void puts(char *str); diff --git a/src/kernel/main.c b/src/kernel/main.c index d1e0744..94cc39b 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -1,7 +1,7 @@ #include -#include "drivers/vga.h" +#include "stdio.h" void __attribute__((cdecl)) kmain(uint64_t magic, uint64_t addr){ - print_string("Hello world!\n\x1b[32m:D\x1b[0m\n"); + printf("Hello world!\n\x1b[32m:D\x1b[0m\n"); for(;;); // Halt here } diff --git a/src/kernel/stdio.c b/src/kernel/stdio.c new file mode 100644 index 0000000..5ed706c --- /dev/null +++ b/src/kernel/stdio.c @@ -0,0 +1,5 @@ +#include "stdio.h" + +void printf(char *fmt, ...){ + puts(fmt); +} diff --git a/src/kernel/stdio.h b/src/kernel/stdio.h new file mode 100644 index 0000000..830ff0f --- /dev/null +++ b/src/kernel/stdio.h @@ -0,0 +1,3 @@ +#pragma once + +void printf(char *fmt, ...);