diff options
| author | Miguel <m.i@gmx.at> | 2018-09-09 03:17:52 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-09 03:17:52 +0200 |
| commit | fc1d491479abd74a1e038ad9ff7d4d330d79e4a8 (patch) | |
| tree | 173bc4bca336fbc8a53c9bbd3468946499e161ae /kernel/kernel.c | |
| parent | 9dabe01545644dd78448d8d489616872f14d964b (diff) | |
ioapic works!
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index e20d2e1..bdb34d9 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -31,7 +31,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) klog("Interrupt Vector Table (IVT) init ..."); interrupts_init(0x08); - klog("Remapping & (not yet Disabling) PIC ..."); + klog("Remapping & Disabling PIC ..."); asm_pic_setup(); klog("Keyboard init ..."); @@ -59,7 +59,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) uint32_t kernel_blocks=mem_init(info); klog("Vritual Memory / Paging init ... "); - pdirectory *dir=vmem_init(kernel_blocks,(uint32_t)info->framebuffer_addr,procdata.local_apic_address); + pdirectory *dir=vmem_init(kernel_blocks,(uint32_t)info->framebuffer_addr,procdata.local_apic_address,procdata.io_apic_address); // klog("Ram Filesystem init ... "); @@ -85,10 +85,10 @@ void kernel_main(uint32_t eax,uint32_t ebx) uint64_t unixtime=timer_init(); klog("Unix Time = %u seconds)",unixtime); - klog("Enable Interrupts & Unlock application processors ... "); + klog("Unlock application processors ... "); asm_smp_unlock(); - // TODO : bsp sti needs to happen before ap sti? seriously? why? is this guaranteed now? - // TODO: switch to ioapic + + klog("Enable Interrupts ... "); x86_sti(); // this will start processing hardware interrupts // now just wait until our scheduler kicks in. |