diff options
| author | Miguel <m.i@gmx.at> | 2018-10-15 23:06:47 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-10-15 23:06:47 +0200 |
| commit | 39f271589fb9db3d6a383857817b13a9bb59d981 (patch) | |
| tree | 0664d03268e49fa1028b144e7b596510bdb65906 /kernel | |
| parent | cf43e3a1205c133505371fb5fd5b2db6b711e195 (diff) | |
ported zlib and libpng and improved compositor to handle 32 AND 24 bit depth
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kernel.c | 6 | ||||
| -rw-r--r-- | kernel/kernel.h | 2 |
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 |