Implement console printf

tailix · Dec 3, 2022 · 3bf16b6 · 3bf16b6
1 parent 64e324e
commit 3bf16b6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/include/drivers/console.h b/include/drivers/console.h
@@ -13,6 +13,9 @@ void drivers_console_print(const char *s);
 void drivers_console_puts(const char *s);
 void drivers_console_write(const char *data, size_t size);
 
+__attribute__((format(printf, 1, 2)))
+void drivers_console_printf(const char *format, ...);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/console.c b/src/console.c
@@ -4,8 +4,18 @@
 
 #include <drivers/console.h>
 
+#include <stdarg.h>
 #include <stddef.h>
 
+int kernaux_vfprintf(
+    void (*out)(char, void*),
+    void *data,
+    const char* format,
+    va_list va
+);
+
+static void file_putc(char c, void *arg);
+
 void drivers_console_putc(const char c)
 {
 #if defined(ASM_X86)
@@ -22,6 +32,14 @@ void drivers_console_print(const char *const s)
     }
 }
 
+void drivers_console_printf(const char *format, ...)
+{
+    va_list va;
+    va_start(va, format);
+    kernaux_vfprintf(file_putc, NULL, format, va);
+    va_end(va);
+}
+
 void drivers_console_puts(const char *const s)
 {
     drivers_console_print(s);
@@ -34,3 +52,8 @@ void drivers_console_write(const char *const data, const size_t size)
         drivers_console_putc(data[i]);
     }
 }
+
+void file_putc(char c, void *arg __attribute__((unused)))
+{
+    drivers_console_putc(c);
+}