diff options
Diffstat (limited to 'lib/stdio/printf.c')
-rw-r--r-- | lib/stdio/printf.c | 69 |
1 files changed, 5 insertions, 64 deletions
diff --git a/lib/stdio/printf.c b/lib/stdio/printf.c index ae4d5b1..4efc1ac 100644 --- a/lib/stdio/printf.c +++ b/lib/stdio/printf.c @@ -1,70 +1,11 @@ -#include <stdarg.h> #include <stdio.h> -#include <string.h> - -#include <devices/uart_16550.h> -#include <devices/vga.h> - -static char buffer[3 * sizeof(int) + 2]; int printf(const char *restrict format, ...) { - int written = 0; - va_list params; - va_start(params, format); - - int s = 0; - int l = 0; - for (int i = 0; format[i] != '\0'; ++i) { - if (format[i] == '%') { - written += uart_puts(COM1, &format[s], l); - vga_puts(&format[s], l); - s = i + 2; - ++i; - - switch (format[i]) { - case 's': { - const char *arg = va_arg(params, const char *); - written += uart_puts(COM1, arg, -1); - vga_puts(arg, -1); - } break; - case 'c': { - const int arg = va_arg(params, int); - uart_write(COM1, arg); - vga_putc(arg); - ++written; - } break; - case 'd': { - const char *arg = itoa(buffer, va_arg(params, int), 10); - written += uart_puts(COM1, arg, -1); - vga_puts(arg, -1); - } break; - case 'u': { - const char *arg = utoa(buffer, va_arg(params, unsigned int), 10); - written += uart_puts(COM1, arg, -1); - vga_puts(arg, -1); - } break; - case 'x': { - const char *arg = utoa(buffer, va_arg(params, unsigned int), 16); - written += uart_puts(COM1, arg, -1); - vga_puts(arg, -1); - } break; - } - - l = 0; - } - - else - ++l; - } - - if (l > 0) { - written += uart_puts(COM1, &format[s], l); - vga_puts(&format[s], l); - } - - va_end(params); - vga_update_cursor(); - return written; + va_list ap; + va_start(ap, format); + int c = vfprintf(stdout, format, ap); + va_end(ap); + return c; } |