default vga color

This commit is contained in:
nub31
2025-09-01 20:54:09 +02:00
parent 5927756988
commit 8cd6bd185d
3 changed files with 13 additions and 11 deletions

View File

@@ -48,20 +48,20 @@ void kprintf(const char* fmt, ...)
if (fmt[i] == '%') if (fmt[i] == '%')
{ {
vga_put_char('%', 0x0F); vga_put_char('%', VGA_DEFAULT_COLOR);
} }
else if (fmt[i] == 's') else if (fmt[i] == 's')
{ {
const char* str = va_arg(args, const char*); const char* str = va_arg(args, const char*);
for (size_t j = 0; str[j] != '\0'; j++) 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') else if (fmt[i] == 'c')
{ {
char character = (char)va_arg(args, int64_t); 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') else if (fmt[i] == 'd')
{ {
@@ -70,7 +70,7 @@ void kprintf(const char* fmt, ...)
itoa64(val, buf); itoa64(val, buf);
for (size_t j = 0; buf[j] != '\0'; j++) 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') else if (fmt[i] == 'u')
@@ -80,12 +80,12 @@ void kprintf(const char* fmt, ...)
uitoa64(val, buf); uitoa64(val, buf);
for (size_t j = 0; buf[j] != '\0'; j++) for (size_t j = 0; buf[j] != '\0'; j++)
{ {
vga_put_char(buf[j], 0x0F); vga_put_char(buf[j], VGA_DEFAULT_COLOR);
} }
} }
else else
{ {
vga_put_char(fmt[i], 0x0F); vga_put_char(fmt[i], VGA_DEFAULT_COLOR);
} }
} }
else if (fmt[i] == '%') else if (fmt[i] == '%')
@@ -94,7 +94,7 @@ void kprintf(const char* fmt, ...)
} }
else else
{ {
vga_put_char(fmt[i], 0x0F); vga_put_char(fmt[i], VGA_DEFAULT_COLOR);
} }
} }

View File

@@ -59,7 +59,7 @@ void vga_put_char(char character, uint8_t color)
vga_buffer[cursor_row * COLUMNS + cursor_col] = (vga_char_t){ vga_buffer[cursor_row * COLUMNS + cursor_col] = (vga_char_t){
.character = ' ', .character = ' ',
.color = VGA_LIGHT_GRAY | VGA_BLACK << 4, .color = VGA_DEFAULT_COLOR,
}; };
break; break;
} }
@@ -94,7 +94,7 @@ void vga_put_char(char character, uint8_t color)
{ {
vga_buffer[ROWS - 1 + col] = (vga_char_t){ vga_buffer[ROWS - 1 + col] = (vga_char_t){
.character = ' ', .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){ vga_buffer[COLUMNS * row - 1 + col] = (vga_char_t){
.character = ' ', .character = ' ',
.color = VGA_LIGHT_GRAY | VGA_BLACK << 4, .color = VGA_DEFAULT_COLOR,
}; };
} }
} }

View File

@@ -19,5 +19,7 @@
#define VGA_YELLOW 14 #define VGA_YELLOW 14
#define VGA_WHITE 15 #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_put_char(char character, uint8_t color);
void vga_clear(); void vga_clear();