From dc5b5d1e5cf82b06fe97ffc8c9374c055e12a748 Mon Sep 17 00:00:00 2001 From: Miguel Date: Sun, 19 Aug 2018 22:39:06 +0200 Subject: disable smp for now :( --- kernel/kernel.c | 5 +++-- kernel/smp.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'kernel') diff --git a/kernel/kernel.c b/kernel/kernel.c index b3acc1d..ba6bc5d 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -67,8 +67,9 @@ void kernel_main(uint32_t eax,uint32_t ebx) // Start the other Processors (before paging because apic addr etc..?) //TODO: !!! Check commented out sleep ()!!! - smp_log_procdata(&procdata); - smp_start_aps(&procdata,"/boot/mp.bin"); //will be copied over mbr + // https://wiki.osdev.org/Symmetric_Multiprocessing + // smp_log_procdata(&procdata); + // smp_start_aps(&procdata,"/boot/mp.bin"); //will be copied over mbr // VIRTUAL MEMORY (paging) pdirectory *dir=vmem_init(kernel_blocks,(uint32_t)info->framebuffer_addr); diff --git a/kernel/smp.c b/kernel/smp.c index b2697fc..815d951 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -28,9 +28,10 @@ void smp_main() { x86_cli(); - while(1); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"local apic_addr:0x%08X",local_apic_addr); + + while(1); //TODO!!! - // log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"local apic_addr:0x%08X",local_apic_addr); uint32_t *reg=local_apic_addr+FOOLOS_APIC_ID; // log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"local apic id: 0x%08X",(*reg)); -- cgit v1.2.3