From 8cd6bd185db67387a529698086ef441494aa5641 Mon Sep 17 00:00:00 2001 From: nub31 Date: Mon, 1 Sep 2025 20:54:09 +0200 Subject: [PATCH] default vga color --- src/kernel.c | 14 +++++++------- src/vga.c | 6 +++--- src/vga.h | 4 +++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/kernel.c b/src/kernel.c index 057952b..3a8a97e 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -48,20 +48,20 @@ void kprintf(const char* fmt, ...) if (fmt[i] == '%') { - vga_put_char('%', 0x0F); + vga_put_char('%', VGA_DEFAULT_COLOR); } else if (fmt[i] == 's') { const char* str = va_arg(args, const char*); for (size_t j = 0; str[j] != '\0'; j++) { - vga_put_char(str[j], 0x0F); + vga_put_char(str[j], VGA_DEFAULT_COLOR); } } else if (fmt[i] == 'c') { char character = (char)va_arg(args, int64_t); - vga_put_char(character, 0x0F); + vga_put_char(character, VGA_DEFAULT_COLOR); } else if (fmt[i] == 'd') { @@ -70,7 +70,7 @@ void kprintf(const char* fmt, ...) itoa64(val, buf); for (size_t j = 0; buf[j] != '\0'; j++) { - vga_put_char(buf[j], 0x0F); + vga_put_char(buf[j], VGA_DEFAULT_COLOR); } } else if (fmt[i] == 'u') @@ -80,12 +80,12 @@ void kprintf(const char* fmt, ...) uitoa64(val, buf); for (size_t j = 0; buf[j] != '\0'; j++) { - vga_put_char(buf[j], 0x0F); + vga_put_char(buf[j], VGA_DEFAULT_COLOR); } } else { - vga_put_char(fmt[i], 0x0F); + vga_put_char(fmt[i], VGA_DEFAULT_COLOR); } } else if (fmt[i] == '%') @@ -94,7 +94,7 @@ void kprintf(const char* fmt, ...) } else { - vga_put_char(fmt[i], 0x0F); + vga_put_char(fmt[i], VGA_DEFAULT_COLOR); } } diff --git a/src/vga.c b/src/vga.c index e1a7b91..59875f5 100644 --- a/src/vga.c +++ b/src/vga.c @@ -59,7 +59,7 @@ void vga_put_char(char character, uint8_t color) vga_buffer[cursor_row * COLUMNS + cursor_col] = (vga_char_t){ .character = ' ', - .color = VGA_LIGHT_GRAY | VGA_BLACK << 4, + .color = VGA_DEFAULT_COLOR, }; break; } @@ -94,7 +94,7 @@ void vga_put_char(char character, uint8_t color) { vga_buffer[ROWS - 1 + col] = (vga_char_t){ .character = ' ', - .color = VGA_LIGHT_GRAY | VGA_BLACK << 4, + .color = VGA_DEFAULT_COLOR, }; }; @@ -110,7 +110,7 @@ void vga_clear() { vga_buffer[COLUMNS * row - 1 + col] = (vga_char_t){ .character = ' ', - .color = VGA_LIGHT_GRAY | VGA_BLACK << 4, + .color = VGA_DEFAULT_COLOR, }; } } diff --git a/src/vga.h b/src/vga.h index 0de24de..da55117 100644 --- a/src/vga.h +++ b/src/vga.h @@ -19,5 +19,7 @@ #define VGA_YELLOW 14 #define VGA_WHITE 15 +#define VGA_DEFAULT_COLOR VGA_LIGHT_GRAY | VGA_BLACK << 4 + void vga_put_char(char character, uint8_t color); -void vga_clear(); +void vga_clear(); \ No newline at end of file