diff --git a/second/console.c b/second/console.c index 6c9d066..5636893 100644 --- a/second/console.c +++ b/second/console.c @@ -4,6 +4,8 @@ * */ +#include + #include "console.h" #include "vga.h" @@ -23,17 +25,17 @@ console_init(emile_l2_header_t* info) serial_init(info); } -void -console_put(char c) +inline int putchar(int c) { if (vga_enabled) vga_put(c); serial_put(c); + + return c; } -void -console_print(const char *s) +void putstring(const char *s) { while(*s) - console_put(*(s++)); + putchar(*(s++)); } diff --git a/second/console.h b/second/console.h index b56a07c..f19f496 100644 --- a/second/console.h +++ b/second/console.h @@ -12,7 +12,6 @@ extern void console_init(emile_l2_header_t* info); -extern void console_put(char c); -extern void console_print(const char *s); +extern void putstring(const char *s); #endif