From 98bf7b67543b36b6fe49f2b68c115ebeaf630603 Mon Sep 17 00:00:00 2001
From: Miguel <m.i@gmx.at>
Date: Wed, 22 Aug 2018 16:35:12 +0200
Subject: cleanup logging

---
 fs/elf.c  | 55 ++++++++++++++++++++++++++++---------------------------
 fs/ext2.c | 31 ++++++++++++++++---------------
 fs/fs.c   |  3 ++-
 3 files changed, 46 insertions(+), 43 deletions(-)

(limited to 'fs')

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;
 }
diff --git a/fs/ext2.c b/fs/ext2.c
index 17e64b6..f1e368d 100644
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -1,3 +1,4 @@
+#include "kernel/kernel.h"
 // ext2 minidriver
 // based on osdev wiki article: http://wiki.osdev.org/Ext2
 
@@ -118,8 +119,8 @@ int ext2_check(uint8_t *ram)
     ram_read(ptr,&super,sizeof(super),1);
 
     if(super.ext2_sig!=0xef53){
-	log(FOOLOS_MODULE_NAME,5,"addr: 0x%08X",ram);
-	panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected");
+	klog("addr: 0x%08X",ram);
+	kpanic("no ext2 signature found, where ram-image expected");
     }
 }
 
@@ -135,8 +136,8 @@ ext2_inode ext2_get_inode(uint8_t *ram,int inode_num)
     ram_read(ptr,&super,sizeof(super),1);
     if(super.ext2_sig!=0xef53)
     {
-	log(FOOLOS_MODULE_NAME,5,"addr: 0x%08X",ram);
-	panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected!");
+	klog("addr: 0x%08X",ram);
+	kpanic("no ext2 signature found, where ram-image expected!");
     }
 
     int block_group=(inode_num-1)/super.inodes_per_group;
@@ -182,7 +183,7 @@ void* ext2_get_indirectstart_double(void *start, uint32_t block_size, uint32_t i
     int indirect1_idx=block_idx/(block_size/4);
     int idx=block_idx%(block_size/4);
 
-    //log(FOOLOS_MODULE_NAME,5,"bl: %d : %d / %d",block_idx,indirect1_idx, idx);
+    //klog("bl: %d : %d / %d",block_idx,indirect1_idx, idx);
     return ext2_get_indirectstart(start,block_size,dil[indirect1_idx],idx);
 }
 
@@ -199,9 +200,9 @@ int ext2_inode_content(char *ram,int inode_nr,uint8_t *ramdest,int max)
     int sum=0;
     int count=0;
 
-    log(FOOLOS_MODULE_NAME,5,"Loading %d.%d bytes",inode.size_high, inode.size_low);
+    klog("Loading %d.%d bytes",inode.size_high, inode.size_low);
 
-    if(inode.size_high>0)panic(FOOLOS_MODULE_NAME,"inode with high.size unsupported, i am sorry.");
+    if(inode.size_high>0)kpanic("inode with high.size unsupported, i am sorry.");
 
     while(pos<inode.size_low) // TODO: use size high!
     {
@@ -236,7 +237,7 @@ int ext2_inode_content(char *ram,int inode_nr,uint8_t *ramdest,int max)
 	    }
 	    else
 	    {
-		panic(FOOLOS_MODULE_NAME,"Triple Indirect Block Pointers not supported yet, file is too big to load, sorry!");
+		kpanic("Triple Indirect Block Pointers not supported yet, file is too big to load, sorry!");
 	    }
 	    
 
@@ -246,7 +247,7 @@ int ext2_inode_content(char *ram,int inode_nr,uint8_t *ramdest,int max)
 	
 
     }
-    log(FOOLOS_MODULE_NAME,5,"Fool Check Sum: 0x%08X for %d bytes",sum,count);
+    klog("Fool Check Sum: 0x%08X for %d bytes",sum,count);
 
 }
 
@@ -264,7 +265,7 @@ int ext2_filename_to_inode_traverse(uint8_t *ram, char *path,int inode_start)
     if(*path==0)final=true;
     else(*path=0);
 
-    log(FOOLOS_MODULE_NAME,20,"looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start);
+    klog("looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start);
 
     fs_dirent dirs[25];
     int count= ext2_read_dir(ram, inode_start,dirs,25); // get dir
@@ -273,15 +274,15 @@ int ext2_filename_to_inode_traverse(uint8_t *ram, char *path,int inode_start)
     {
 	if(!strcmp_l(first,dirs[i].name,0))
 	{
-	    log(FOOLOS_MODULE_NAME,20,"found: %s (%s)",first,dirs[i].type==FS_FILE_TYPE_DIR?"dir":"file");
+	    klog("found: %s (%s)",first,dirs[i].type==FS_FILE_TYPE_DIR?"dir":"file");
 	    if(final)return dirs[i].inode;
 	    return ext2_filename_to_inode_traverse(ram,last+1,dirs[i].inode);
 	}
-	//log(FOOLOS_MODULE_NAME,5,"no match: %s",dirs[i].name);
+	//klog("no match: %s",dirs[i].name);
     }
 
 
-    log(FOOLOS_MODULE_NAME,5,"file not found!");
+    klog("file not found!");
     return -1;
     
 
@@ -305,7 +306,7 @@ int ext2_filename_to_inode(uint8_t *ram, char *path)
 int ext2_read_dir(uint8_t *ram, int inode_nr,fs_dirent *dirs,int max)
 {
 
-    log(FOOLOS_MODULE_NAME,20,"read_dir : max: %d",max);
+    klog("read_dir : max: %d",max);
     ext2_inode inode=ext2_get_inode(ram,inode_nr);
 
     char buf[256];
@@ -353,7 +354,7 @@ int ext2_read_dir(uint8_t *ram, int inode_nr,fs_dirent *dirs,int max)
 	    i++;
 	}while(buf[i-1]!=0);
 
-//	log(FOOLOS_MODULE_NAME,5,"name: %s\n",dirs[c].name);
+//	klog("name: %s\n",dirs[c].name);
 
 	c++;
 
diff --git a/fs/fs.c b/fs/fs.c
index 0194358..03a522f 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -1,3 +1,4 @@
+#include "kernel/kernel.h"
 // abstraction layer for filesystems
 
 #include "fs.h"
@@ -26,7 +27,7 @@ void fs_mount(multiboot_information *info)
 	multiboot_mod *mod=info->mods_addr;
 	for(int i=0;i<info->mods_count;i++)
 	{
-	    log(FOOLOS_MODULE_NAME,5,"mounting mod from 0x%08X-0x%08X : %s", 
+	    klog("mounting mod from 0x%08X-0x%08X : %s", 
 		    mod->mod_start,mod->mod_end, mod->string);
 	    
 	    //pmmngr_deinit_region(mod->mod_start,((uint32_t)mod->mod_end-(uint32_t)mod->mod_start)+1);
-- 
cgit v1.2.3