summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kernel.c6
-rw-r--r--kernel/kernel.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index a34be42..31f169b 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -146,9 +146,9 @@ 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_pitch);
- compositor_set_background("/home/miguel/bg.ppm");
- //compositor_set_background(0);
+ 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");
// -- KB DRIVER -- //
klog("Keyboard init ...");
diff --git a/kernel/kernel.h b/kernel/kernel.h
index cf21c60..0194ef3 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -32,7 +32,7 @@ REFERENCES
//#define LOG_SYSCALLS
#define HIDE_FIXME
-#define FOOLOS_APIC_FREQ 15 // how many apic ticks per second
+#define FOOLOS_APIC_FREQ 25 // how many apic ticks per second
#define MAX_MOUNTS 10