From 45ce8728224caa44d31dca3117992b193fa3cd98 Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 19 Oct 2018 02:41:53 +0200 Subject: window manager continued --- kernel/kernel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'kernel/kernel.c') 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 ..."); -- cgit v1.2.3