diff options
| author | Miguel <m.i@gmx.at> | 2018-10-19 02:41:53 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-10-19 02:41:53 +0200 |
| commit | 45ce8728224caa44d31dca3117992b193fa3cd98 (patch) | |
| tree | 8d37cfe273e9feeb8376b6205abe29c995e40ac2 /kernel/kernel.c | |
| parent | 9bfd9fb6a7c568b56a5ef525a2b76351780bae66 (diff) | |
window manager continued
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index a630f94..a259446 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -38,7 +38,6 @@ #include "fs/elf.h" #include "kmalloc.h" -#include "driver/vesa.h" #include "asm_pit.h" /** F00L 0S Entry point (called directly from asm/multiboot.asm) @@ -147,8 +146,8 @@ void kernel_main(uint32_t eax,uint32_t ebx) // -- COMPOSITOR (TODO: text-mode fallback) -- // klog("Compositor init ..."); compositor_init(cfg_multiboot->framebuffer_width,cfg_multiboot->framebuffer_height, - cfg_multiboot->framebuffer_bpp,cfg_multiboot->framebuffer_pitch); - compositor_set_background("/home/miguel/icons.ppm"); + cfg_multiboot->framebuffer_bpp,cfg_multiboot->framebuffer_pitch, + VMEM_FRAMEBUFFER); // -- KB DRIVER -- // klog("Keyboard init ..."); |