cleanup logging

1 files changed, 15 insertions, 14 deletions

diff --git a/kernel/acpi.c b/kernel/acpi.c
index 169aa84..c41e91f 100644
--- a/kernel/acpi.c
+++ b/kernel/acpi.c
@@ -1,3 +1,4 @@
+#include "kernel/kernel.h"
 // Advanced Configuration and Power Interface
 // http://wiki.xomb.org/index.php?title=ACPI_Tables
 
@@ -56,17 +57,17 @@ typedef struct
 uint8_t *apci_get_next_entry(uint8_t *addr,smp_processors *procdata)
 {
 
-    log(FOOLOS_MODULE_NAME,20,"Examining MADT Entry at 0x%08X",addr);
+    klog("Examining MADT Entry at 0x%08X",addr);
 
     if(*addr==0)
     {
-	log(FOOLOS_MODULE_NAME,5,"MADT Entry: LocalAPIC");
+	klog("MADT Entry: LocalAPIC");
 	// usable
 	if(addr[4]&1)
 	{
 	    if(procdata->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.");
 	    }
 
 	    procdata->local_apic_id[procdata->processors]=addr[3];
@@ -76,10 +77,10 @@ uint8_t *apci_get_next_entry(uint8_t *addr,smp_processors *procdata)
     }
     else if(*addr==1)
     {
-	log(FOOLOS_MODULE_NAME,5,"MADT Entry: IO APIC");
+	klog("MADT Entry: IO APIC");
     }
-    else if(*addr==2)log(FOOLOS_MODULE_NAME,5,"MADT Entry: Interrupt Source Override");
-    else log(FOOLOS_MODULE_NAME,5,"MADT Entry: type:0x%X",*addr);
+    else if(*addr==2)klog("MADT Entry: Interrupt Source Override");
+    else klog("MADT Entry: type:0x%X",*addr);
 
     return addr+addr[1];
 }
@@ -89,10 +90,10 @@ void acpi_check_madt(uint32_t *madt,smp_processors *procdata)
 {
     acpi_madt *table=(acpi_madt *)*madt;
 
-    log(FOOLOS_MODULE_NAME,20,"Looking for MADT Table at %08X.",table);
+    klog("Looking for MADT Table at %08X.",table);
     if(!strcmp_l("APIC",table->sig,4))
     {
-	log(FOOLOS_MODULE_NAME,5,"Found MADT Table at 0x%08X",table);
+	klog("Found MADT Table at 0x%08X",table);
 	uint8_t *end=(uint8_t *)table;
 	end+=table->length;
 
@@ -112,17 +113,17 @@ void acpi_check_madt(uint32_t *madt,smp_processors *procdata)
 
 void acpi_read_rsdt(acpi_rsdt *rsdt,smp_processors *procdata)
 {
-    log(FOOLOS_MODULE_NAME,5,"Reading RSDT Table at 0x%08X",rsdt);
+    klog("Reading RSDT Table at 0x%08X",rsdt);
 
     if(strcmp_l("RSDT",rsdt->sig,4)) 
-	panic(FOOLOS_MODULE_NAME,"Signature MISMATCH!");
+	kpanic("Signature MISMATCH!");
 
     int entries=(rsdt->length-sizeof(acpi_rsdt))/4;
     uint32_t *first=(uint32_t *)rsdt;
     first+=sizeof(acpi_rsdt)/4;
 
-    log(FOOLOS_MODULE_NAME,5,"Entries: %d",entries);
-    log(FOOLOS_MODULE_NAME,5,"Looking for MADT Table");
+    klog("Entries: %d",entries);
+    klog("Looking for MADT Table");
     for(int i=0;i<entries;i++)
     {
 
@@ -138,7 +139,7 @@ void acpi_read_rsdt(acpi_rsdt *rsdt,smp_processors *procdata)
 
 bool acpi_find(smp_processors *procdata)
 {
-    log(FOOLOS_MODULE_NAME,5,"Looking for RSDP Table");
+    klog("Looking for RSDP Table");
     char *search=(char *)0x9f000; //will be 16 bit aligned;
     procdata->processors=0;
     procdata->boot=0;
@@ -153,7 +154,7 @@ bool acpi_find(smp_processors *procdata)
 
 		if(checksum==0)
 		{
-		    log(FOOLOS_MODULE_NAME,5,"RSDP Table found at 0x%08X",search);
+		    klog("RSDP Table found at 0x%08X",search);
 		    acpi_rsdp *rsdp=(acpi_rsdp *)search;
 		    acpi_read_rsdt(rsdp->ptr_rsdt,procdata);
 		    return true;