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/ext2.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'fs/ext2.c')

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++;
 
-- 
cgit v1.2.3