diff options
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 1969102..4406ea0 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -51,7 +51,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) klog("Memory init ... "); uint32_t kernel_blocks=mem_init(info); - klog("Ram Filesystem init ... "); // required by mp.bin ???? + klog("Ram Filesystem init ... "); fs_mount(info); // Start the other Processors (before paging because apic addr etc..?) @@ -59,7 +59,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) // https://wiki.osdev.org/Symmetric_Multiprocessing klog("Symmetric Multi Processing (SMP) start ... "); smp_log_procdata(&procdata); - smp_start_aps(&procdata); + //smp_start_aps(&procdata); klog("Vritual Memory / Paging init ... "); pdirectory *dir=vmem_init(kernel_blocks,(uint32_t)info->framebuffer_addr); @@ -69,7 +69,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) klog("Video Electronics Standards Association (VESA) init ... "); // TODO check if text or fb? uint32_t addr=kballoc(1); - fs_content("/binfont.bin",addr,0x100); // copy 0x100 bytes to 0x7000 + fs_content("/binfont.bin",addr,0x100); // copy font (0x100 bytes) to memory. vesa_init(info->vbe_control_info,info->vbe_mode_info,addr); klog("stdin/stdout init ..."); @@ -82,5 +82,4 @@ void kernel_main(uint32_t eax,uint32_t ebx) klog("Enable Interrupts & Start Scheduling ..."); scheduler_init(dir); - } |