diff --git a/src/kernel/drivers/vga/video.h b/src/kernel/drivers/vga/video.h index 637c706..149e2da 100644 --- a/src/kernel/drivers/vga/video.h +++ b/src/kernel/drivers/vga/video.h @@ -1,7 +1,7 @@ #ifndef TSOS_DRV_VGA_H // Avoid nasty double-inclusion problems #define TSOS_DRV_VGA_H #define VMEM_ADDR 0xb8000 -#include "kernel/types/ktypes.h" +#include "../../types/ktypes.h" uchar_t vga_writeb(u16_t port); diff --git a/src/kernel/main.c b/src/kernel/main.c index 79fc590..c45f7de 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -1,9 +1,10 @@ // Entry point of the TSOS kernel #include "types/ktypes.h" +#include "drivers/vga/video.h" void kmain(void) { - char_t* vbuf = (char_t*)0xb8000; + char_t* vbuf = (char_t*)VMEM_ADDR; vbuf += 480; // We skip the log messages before us char_t *s = "Hello from the TSOS kernel!"; for (int_t i = 0; s[i] != '\0'; i++) {