diff options
| author | Alexis211 <alexis211@gmail.com> | 2010-08-10 22:17:24 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2010-08-10 22:17:24 +0200 |
| commit | a75acb568a301903f00d3230467de2a097cce0db (patch) | |
| tree | 27dab61327d56238aafaad3d4a291da422c3bed1 /src/kernel/core | |
| parent | c7c2e36c2bb2cf7302f60a70e0ede0490f98b05e (diff) | |
| download | TCE-a75acb568a301903f00d3230467de2a097cce0db.tar.gz TCE-a75acb568a301903f00d3230467de2a097cce0db.zip | |
Added priorities to the scheduler.
Diffstat (limited to 'src/kernel/core')
| -rw-r--r-- | src/kernel/core/kmain.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/kernel/core/kmain.c b/src/kernel/core/kmain.c index a7b8414..65a39e6 100644 --- a/src/kernel/core/kmain.c +++ b/src/kernel/core/kmain.c @@ -34,10 +34,6 @@ void kmain(struct multiboot_info_t* mbd, int32_t magic) { mem_placementAddr = (mods[i].mod_end & 0xFFFFF000) + 0x1000; } - if (magic != MULTIBOOT_BOOTLOADER_MAGIC) { - PANIC("wrong multiboot magic number."); - } - monitor_write("Grapes 0.0.4 'Cat in my heart' starting up :\n"); idt_init(); @@ -46,8 +42,9 @@ void kmain(struct multiboot_info_t* mbd, int32_t magic) { paging_init(totalRam); gdt_init(); paging_cleanup(); + kheap_init(); - timer_init(15); + timer_init(30); tasking_init(); monitor_write("\nLoading modules :\n"); |