Reorder and change code of console driver

This commit is contained in:
Alex Kotov 2021-12-26 11:15:49 +05:00
parent 1089a5f481
commit 9461afd846
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
2 changed files with 17 additions and 14 deletions

View File

@ -7,10 +7,11 @@ extern "C" {
#include <stddef.h>
void kernaux_console_putc(char c);
void kernaux_console_print(const char *s);
void kernaux_console_printf(const char *format, ...)
__attribute__((format(printf, 1, 2)));
void kernaux_console_putc(char c);
void kernaux_console_puts(const char *s);
void kernaux_console_write(const char *data, size_t size);

View File

@ -10,11 +10,6 @@
#include <kernaux/libc.h>
#include <kernaux/printf.h>
void kernaux_console_print(const char *const s)
{
kernaux_console_write(s, strlen(s));
}
void kernaux_console_putc(const char c __attribute__((unused)))
{
#ifdef ASM_I386
@ -22,6 +17,21 @@ void kernaux_console_putc(const char c __attribute__((unused)))
#endif
}
void kernaux_console_print(const char *const s)
{
for (const char *c = s; *c; ++c) {
kernaux_console_putc(*c);
}
}
void kernaux_console_printf(const char *format, ...)
{
va_list va;
va_start(va, format);
kernaux_printf_va(kernaux_console_putc, format, va);
va_end(va);
}
void kernaux_console_puts(const char *const s)
{
kernaux_console_print(s);
@ -34,11 +44,3 @@ void kernaux_console_write(const char *const data, const size_t size)
kernaux_console_putc(data[i]);
}
}
void kernaux_console_printf(const char *format, ...)
{
va_list va;
va_start(va, format);
kernaux_printf_va(kernaux_console_putc, format, va);
va_end(va);
}