diff options
Diffstat (limited to 'kernel/mp.c')
| -rw-r--r-- | kernel/mp.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/kernel/mp.c b/kernel/mp.c index 8e5a7a6..e03f224 100644 --- a/kernel/mp.c +++ b/kernel/mp.c @@ -1,3 +1,4 @@ +#include "kernel/kernel.h" #include <stdbool.h> @@ -66,21 +67,21 @@ uint8_t *walk_mp_table(uint8_t *start_addr,smp_processors *smp) { if(*start_addr==0x0||*start_addr==0x2) - log(FOOLOS_MODULE_NAME,5,"entry type: %d",*start_addr); + klog("entry type: %d",*start_addr); // that is a processor if(*start_addr==0x00) { proc_entry *pro=start_addr; - log(FOOLOS_MODULE_NAME,5,"local apic id: %02X",pro->apic_id); - log(FOOLOS_MODULE_NAME,5,"cpu enabled bit: %s",pro->cpu_bits&1?"yes":"no"); - log(FOOLOS_MODULE_NAME,5,"bootstrap cpu bit: %s",pro->cpu_bits&2?"yes":"no"); + klog("local apic id: %02X",pro->apic_id); + klog("cpu enabled bit: %s",pro->cpu_bits&1?"yes":"no"); + klog("bootstrap cpu bit: %s",pro->cpu_bits&2?"yes":"no"); // that is a enabled processor if(pro->cpu_bits&1) { if(smp->processors>=SMP_MAX_PROC) - panic(FOOLOS_MODULE_NAME,"we do not support that many processors. recompile with higher SMP_MAX_PROC."); + kpanic("we do not support that many processors. recompile with higher SMP_MAX_PROC."); smp->local_apic_id[smp->processors]=pro->apic_id; // that is the bootstrap processor @@ -101,12 +102,12 @@ void do_mp_conf(mp_config *addr,smp_processors *procdata) uint32_t *buf_addr=buf; *buf_addr=addr->sig; - log(FOOLOS_MODULE_NAME,5,"mp_config table addr: %08X",addr); - log(FOOLOS_MODULE_NAME,5,"mp_config signature: %s",buf); - log(FOOLOS_MODULE_NAME,5,"mp_config version: %02X",addr->version); - log(FOOLOS_MODULE_NAME,5,"mp_config # of entries: %d",addr->entries); - log(FOOLOS_MODULE_NAME,5,"mp_config local apic addr: 0x%08X",addr->local_apic); - log(FOOLOS_MODULE_NAME,5,"mp_config tabel length: %d",addr->length); + klog("mp_config table addr: %08X",addr); + klog("mp_config signature: %s",buf); + klog("mp_config version: %02X",addr->version); + klog("mp_config # of entries: %d",addr->entries); + klog("mp_config local apic addr: 0x%08X",addr->local_apic); + klog("mp_config tabel length: %d",addr->length); uint8_t *start_addr=addr; start_addr+=44; @@ -134,12 +135,12 @@ bool do_mp_fps(mp_fps *addr,smp_processors *procdata) uint32_t *buf_addr=buf; *buf_addr=addr->sig; - log(FOOLOS_MODULE_NAME,5,"signature: %s",buf); - log(FOOLOS_MODULE_NAME,5,"conf: %08X",addr->conf); - log(FOOLOS_MODULE_NAME,5,"ver: %02X",addr->version); - log(FOOLOS_MODULE_NAME,5,"f1: %02X",addr->features1); + klog("signature: %s",buf); + klog("conf: %08X",addr->conf); + klog("ver: %02X",addr->version); + klog("f1: %02X",addr->features1); - if(addr->features1!=0)panic(FOOLOS_MODULE_NAME,"Intel default config not supported yet!"); + if(addr->features1!=0)kpanic("Intel default config not supported yet!"); do_mp_conf(addr->conf,procdata); return true; @@ -149,13 +150,13 @@ bool do_mp_fps(mp_fps *addr,smp_processors *procdata) bool mp_find(smp_processors *procdata) { - log(FOOLOS_MODULE_NAME,5,"Looking for Mp Floating Ponter Struct..."); + klog("Looking for Mp Floating Ponter Struct..."); uint8_t *addr=0x8000; while(addr<=0xfffff) { if(!strcmp_l("_MP_",addr,4)) { - // log(FOOLOS_MODULE_NAME,5,"Found at 0x%04X",addr); + // klog("Found at 0x%04X",addr); if(do_mp_fps(addr,procdata))return true; } addr++; @@ -166,7 +167,7 @@ bool mp_find(smp_processors *procdata) { if(!strcmp_l("_MP_",addr,4)) { - // log(FOOLOS_MODULE_NAME,5,"Found at 0x%04X",addr); + // klog("Found at 0x%04X",addr); if(do_mp_fps(addr,procdata))return true; } addr++; |