cleanup logging

1 files changed, 16 insertions, 16 deletions

diff --git a/kernel/vmem.c b/kernel/vmem.c
index 3d78cae..76421d0 100644
--- a/kernel/vmem.c
+++ b/kernel/vmem.c
@@ -249,8 +249,8 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir)
     //
     pdirectory*	dir = (pdirectory*) kballoc(1);
 
-    log(FOOLOS_MODULE_NAME,5,"new pdirectory: 0x%X",dir);
-    if (!dir)panic(FOOLOS_MODULE_NAME,"unable to alloc pdirectory");
+    klog("new pdirectory: 0x%X",dir);
+    if (!dir)kpanic("unable to alloc pdirectory");
 
     // first of all let's zero all the entries
     for(int i=0;i<1024;i++)dir->m_entries [i]=0;
@@ -271,7 +271,7 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir)
 	{
 	    // alloc space for our new table
 	    table = (ptable*) kballoc(1);
-	    if (!table)panic(FOOLOS_MODULE_NAME,"unable to alloc table");
+	    if (!table)kpanic("unable to alloc table");
 
 	    //! idenitity mapping
 	    for (int i=0, frame=phys_addr, virt=virt_addr; i<1024; i++, frame+=4096, virt+=4096) 
@@ -323,7 +323,7 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir)
 	{
 	    // alloc space for our new table
 	    table = (ptable*) kballoc(1);
-	    if (!table)panic(FOOLOS_MODULE_NAME,"unable to alloc table");
+	    if (!table)kpanic("unable to alloc table");
 
 	    //! idenitity mapping
 	    for (int i=0, frame=phys_addr, virt=virt_addr; i<1024; i++, frame+=4096, virt+=4096) 
@@ -374,22 +374,22 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir)
 	    oldentry=&(copy_dir->m_entries[PAGE_DIRECTORY_INDEX(virt_addr)]);
 	    oldtable=pd_entry_get_frame(oldentry);
 	}
-	log(FOOLOS_MODULE_NAME,20,"oldtable at: 0x%08X",oldtable);
+	klog("oldtable at: 0x%08X",oldtable);
 
-	if (!table)panic(FOOLOS_MODULE_NAME,"unable to alloc table");
-	log(FOOLOS_MODULE_NAME,20,"alloc table: %08X",table);
+	if (!table)kpanic("unable to alloc table");
+	klog("alloc table: %08X",table);
     
 	for (int i=0, virt=virt_addr; i<1024; i++, virt+=4096) 
 	{
-	    //log(FOOLOS_MODULE_NAME,5,"i = %d",i);
+	    //klog("i = %d",i);
 	    phys_addr=pmmngr_alloc_block();   // get free space from the memory manager
-	    if (!phys_addr)panic(FOOLOS_MODULE_NAME,"unable to alloc spce for frame");
+	    if (!phys_addr)kpanic("unable to alloc spce for frame");
 
 	    // if this is not init , copy contents from current space!
 	    if(copy_dir!=NULL)
 	    {
 		uint32_t addr_old=pt_entry_get_frame(&oldtable->m_entries[PAGE_TABLE_INDEX(virt)]);
-		log(FOOLOS_MODULE_NAME,99,"physical memcpy(0x%08X,0x%08X,4096)",phys_addr, addr_old);
+		klog("physical memcpy(0x%08X,0x%08X,4096)",phys_addr, addr_old);
 		memcpy(phys_addr,addr_old,4096);
 
 	    }
@@ -434,21 +434,21 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir)
 	    oldentry=&(copy_dir->m_entries[PAGE_DIRECTORY_INDEX(virt_addr)]);
 	    oldtable=pd_entry_get_frame(oldentry);
 	}
-	log(FOOLOS_MODULE_NAME,20,"oldtable at: 0x%08X",oldtable);
+	klog("oldtable at: 0x%08X",oldtable);
 
-	if (!table)panic(FOOLOS_MODULE_NAME,"unable to alloc table");
-	log(FOOLOS_MODULE_NAME,20,"alloc table: %08X",table);
+	if (!table)kpanic("unable to alloc table");
+	klog("alloc table: %08X",table);
     
 	for (int i=0, virt=virt_addr; i<1024; i++, virt+=4096) 
 	{
 	    phys_addr=pmmngr_alloc_block();   // get free space from the memory manager
-	    if (!phys_addr)panic(FOOLOS_MODULE_NAME,"unable to alloc spce for frame");
+	    if (!phys_addr)kpanic("unable to alloc spce for frame");
 
 	    // if this is not init , copy contents from current space!
 	    if(copy_dir!=NULL)
 	    {
 		uint32_t addr_old=pt_entry_get_frame(&oldtable->m_entries[PAGE_TABLE_INDEX(virt)]);
-		log(FOOLOS_MODULE_NAME,99,"physical memcpy(0x%08X,0x%08X,4096)",phys_addr, addr_old);
+		klog("physical memcpy(0x%08X,0x%08X,4096)",phys_addr, addr_old);
 		memcpy(phys_addr,addr_old,4096);
 
 	    }
@@ -481,7 +481,7 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir)
 
     if(copy_dir==NULL) // this happens only on init
     {
-	log(FOOLOS_MODULE_NAME,5,"initializing virtual memory (paging)");
+	klog("initializing virtual memory (paging)");
 	x86_set_page_directory(dir);
     }