cleanup logging

1 files changed, 28 insertions, 27 deletions

diff --git a/fs/elf.c b/fs/elf.c
index 3e32f55..f8e3f66 100644
--- a/fs/elf.c
+++ b/fs/elf.c
@@ -1,3 +1,4 @@
+#include "kernel/kernel.h"
 #include <stdint.h>
 #include "ext2.h"
 
@@ -79,41 +80,41 @@ uint32_t load_elf(char *name, uint32_t *alloc)
     //uint32_t vaddr=0x08000000;
     uint32_t vaddr=0x08048000;
 
-    log(FOOLOS_MODULE_NAME,5,"loading %s",name);
+    klog("loading %s",name);
     ext2_check(ext2_ramimage);
     ext2_inode_content(ext2_ramimage,inode_nr,vaddr,0x100000); // max ignored??
 
-    log(FOOLOS_MODULE_NAME,20,"ELF File loaded to final destination.");
+    klog("ELF File loaded to final destination.");
 
     Elf32_Ehdr *elf;
     elf=vaddr;
 
     if(elf->e_ident[0]!=0x7f||elf->e_ident[1]!='E'||elf->e_ident[2]!='L'||elf->e_ident[3]!='F')
-	panic(FOOLOS_MODULE_NAME,"ELF mismatch!?");
+	kpanic("ELF mismatch!?");
 
     
     /*
-    log(FOOLOS_MODULE_NAME, 5, 
+    klog( 
 	    "elf id: class=%d, data=%d, version=%d osabi=%d abiv=%d ",
 	    elf->e_ident[4],elf->e_ident[5],elf->e_ident[6],
 	    elf->e_ident[7],elf->e_ident[8]);
 
-    log(FOOLOS_MODULE_NAME,5,"elf type: 0x%04x",elf->e_type);
-    log(FOOLOS_MODULE_NAME,5,"elf machine: 0x%04x",elf->e_machine);
-    log(FOOLOS_MODULE_NAME,5,"elf version: %d",elf->e_version);
-    log(FOOLOS_MODULE_NAME,5,"elf entry: 0x%08X",elf->e_entry);
-    log(FOOLOS_MODULE_NAME,5,"elf ph-offset: 0x%08X",elf->e_phoff);
-    log(FOOLOS_MODULE_NAME,5,"elf sh-offset: 0x%08X",elf->e_shoff);
-    log(FOOLOS_MODULE_NAME,5,"elf flags: 0x%08X",elf->e_flags);
-    log(FOOLOS_MODULE_NAME,5,"elf eh-size (bytes): %d",elf->e_ehsize);
+    klog("elf type: 0x%04x",elf->e_type);
+    klog("elf machine: 0x%04x",elf->e_machine);
+    klog("elf version: %d",elf->e_version);
+    klog("elf entry: 0x%08X",elf->e_entry);
+    klog("elf ph-offset: 0x%08X",elf->e_phoff);
+    klog("elf sh-offset: 0x%08X",elf->e_shoff);
+    klog("elf flags: 0x%08X",elf->e_flags);
+    klog("elf eh-size (bytes): %d",elf->e_ehsize);
 
-    log(FOOLOS_MODULE_NAME,5,"elf ph-ent-size(bytes): %d",elf->e_phentsize);
-    log(FOOLOS_MODULE_NAME,5,"elf ph-num: %d",elf->e_phnum);
+    klog("elf ph-ent-size(bytes): %d",elf->e_phentsize);
+    klog("elf ph-num: %d",elf->e_phnum);
 
-    log(FOOLOS_MODULE_NAME,5,"elf sh-ent-size(byte): %d",elf->e_shentsize);
-    log(FOOLOS_MODULE_NAME,5,"elf sh-num: %d",elf->e_shnum);
+    klog("elf sh-ent-size(byte): %d",elf->e_shentsize);
+    klog("elf sh-num: %d",elf->e_shnum);
 
-    log(FOOLOS_MODULE_NAME,5,"elf sh-strndx: %d",elf->e_shstrndx);
+    klog("elf sh-strndx: %d",elf->e_shstrndx);
     */
 
     // iterate over section headers
@@ -123,7 +124,7 @@ uint32_t load_elf(char *name, uint32_t *alloc)
 
 	if(phidx==0)
 	{
-	    log(FOOLOS_MODULE_NAME,20,"text: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz);
+	    klog("text: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz);
 	}
 
 	if(phidx==1)
@@ -131,17 +132,17 @@ uint32_t load_elf(char *name, uint32_t *alloc)
 
 
 	    /*
-	    log(FOOLOS_MODULE_NAME,5,"-- PROGRAMM HEADER %d --",phidx+1);
-	    log(FOOLOS_MODULE_NAME,5,"p-type: %d",phdr->p_type);
-	    log(FOOLOS_MODULE_NAME,5,"p-offset: 0x%08X",phdr->p_offset);
-	    log(FOOLOS_MODULE_NAME,5,"p-vaddr: 0x%08X",phdr->p_vaddr);
-	    log(FOOLOS_MODULE_NAME,5,"p-filesz: 0x%08X",phdr->p_filesz);
-	    log(FOOLOS_MODULE_NAME,5,"p-memsz: 0x%08X",phdr->p_memsz);
+	    klog("-- PROGRAMM HEADER %d --",phidx+1);
+	    klog("p-type: %d",phdr->p_type);
+	    klog("p-offset: 0x%08X",phdr->p_offset);
+	    klog("p-vaddr: 0x%08X",phdr->p_vaddr);
+	    klog("p-filesz: 0x%08X",phdr->p_filesz);
+	    klog("p-memsz: 0x%08X",phdr->p_memsz);
 	    */
 	    
 	    
-	    log(FOOLOS_MODULE_NAME,20,"data: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz);
-	    log(FOOLOS_MODULE_NAME,20,"bss: 0x%08X-0x%08X",phdr->p_vaddr+phdr->p_filesz,phdr->p_vaddr+phdr->p_memsz);
+	    klog("data: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz);
+	    klog("bss: 0x%08X-0x%08X",phdr->p_vaddr+phdr->p_filesz,phdr->p_vaddr+phdr->p_memsz);
 
 	    // let's copy the rw- data block
 	    // from right to left so we not overwrite ourselves!!
@@ -167,7 +168,7 @@ uint32_t load_elf(char *name, uint32_t *alloc)
 
 
     }
-    log(FOOLOS_MODULE_NAME,20,"heap starts at: 0x%08X",*alloc);
+    klog("heap starts at: 0x%08X",*alloc);
 
     return elf->e_entry;
 }