diff options
| author | Miguel <m.i@gmx.at> | 2018-10-04 02:17:13 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-10-04 02:17:13 +0200 |
| commit | 81a8252db679351f5ba388b420519724c9c2c2be (patch) | |
| tree | d21bb88fb36f9492c0daf14d67c46f0b22b66def /kernel/kernel.c | |
| parent | ce16fe524c14ccaae67fb634105da5aef08ead48 (diff) | |
reverting userspace idea
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 3e07fde..66021e2 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -155,15 +155,16 @@ void kernel_main(uint32_t eax,uint32_t ebx) uint32_t addr= ext2_inode_blockstart( VMEM_EXT2_RAMIMAGE,inode,0); vesa_init(cfg_multiboot,addr); // this only sets some internal static variables - klog("Compositor init ..."); - compositor_init(cfg_multiboot->framebuffer_width,cfg_multiboot->framebuffer_height,cfg_multiboot->framebuffer_pitch); - compositor_set_background("/home/miguel/bg.ppm"); // -- STD STREAMS -- // klog("Standard Streams init ..."); fd_init_std_streams(0,cfg_multiboot->framebuffer_type!=2); */ + klog("Compositor init ..."); + compositor_init(cfg_multiboot->framebuffer_width,cfg_multiboot->framebuffer_height,cfg_multiboot->framebuffer_pitch); + compositor_set_background("/home/miguel/bg.ppm"); + // -- KB -- // klog("Keyboard init ..."); keyboard_init(); |