diff options
| author | Miguel <m.i@gmx.at> | 2018-08-22 16:35:12 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-08-22 16:35:12 +0200 |
| commit | 98bf7b67543b36b6fe49f2b68c115ebeaf630603 (patch) | |
| tree | aad818381dfc42c4158b923d588bbe8d34f51e51 /kernel/smp.c | |
| parent | 323fb9d3e09903d6fa43ef7e1f0cc8934414c8d4 (diff) | |
cleanup logging
Diffstat (limited to 'kernel/smp.c')
| -rw-r--r-- | kernel/smp.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/kernel/smp.c b/kernel/smp.c index 6a1068c..d4bb6a1 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -1,3 +1,4 @@ +#include "kernel/kernel.h" // http://www.intel.com/content/dam/doc/specification-update/64-architecture-x2apic-specification.pdf // http://download.intel.com/design/chipsets/datashts/29056601.pdf // http://www.scs.stanford.edu/05au-cs240c/lab/ia32/IA32-3.pdf @@ -27,12 +28,12 @@ void smp_main() { x86_cli(); - log(FOOLOS_MODULE_NAME,5,"local apic_addr:0x%08X",local_apic_addr); + klog("local apic_addr:0x%08X",local_apic_addr); while(1); //TODO!!! uint32_t *reg=local_apic_addr+FOOLOS_APIC_ID; - // log(FOOLOS_MODULE_NAME,5,"local apic id: 0x%08X",(*reg)); + // klog("local apic id: 0x%08X",(*reg)); *reg=local_apic_addr+FOOLOS_APIC_SPUR_INT; *reg|=0x100;//0xffffffff; // all bits 1 and interrupt 255 @@ -67,7 +68,7 @@ void kernel_ap() cpu_counter[p]++; //lock_spin(0); - if(cpu_counter[p]%1000000==0)log(FOOLOS_MODULE_NAME,20,"cpu[%d] %d",p,cpu_counter[p]); + if(cpu_counter[p]%1000000==0)klog("cpu[%d] %d",p,cpu_counter[p]); //lock_release(0); } @@ -75,10 +76,10 @@ void kernel_ap() void smp_log_procdata(smp_processors *procdata) { - log(FOOLOS_MODULE_NAME,5,"---- smp -----"); + klog("---- smp -----"); for(int i=0;i<procdata->processors;i++) { - log(FOOLOS_MODULE_NAME,5,"cpu %d, apic_id: 0x%X, bps: %s, apic_addr:0x%08X",i,procdata->local_apic_id[i],i==procdata->boot?"yes":"no",procdata->local_apic_address); + klog("cpu %d, apic_id: 0x%X, bps: %s, apic_addr:0x%08X",i,procdata->local_apic_id[i],i==procdata->boot?"yes":"no",procdata->local_apic_address); } } @@ -101,13 +102,13 @@ void smp_start_aps(smp_processors *pros,char *path) // *reg=0; uint32_t *reg=local_apic_addr+FOOLOS_APIC_ID; - log(FOOLOS_MODULE_NAME,5,"local apic id: 0x%08X",(*reg)); + klog("local apic id: 0x%08X",(*reg)); for(int i=0;i<pros->processors;i++) { if(pros->boot==i)continue; - log(FOOLOS_MODULE_NAME,5,"starting cpu %d",i); + klog("starting cpu %d",i); uint8_t dest=pros->local_apic_id[i]; |