summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/elf.c53
-rw-r--r--fs/ext2.c23
-rw-r--r--fs/fs.c3
3 files changed, 38 insertions, 41 deletions
diff --git a/fs/elf.c b/fs/elf.c
index b4e4ad6..0a8d752 100644
--- a/fs/elf.c
+++ b/fs/elf.c
@@ -1,6 +1,5 @@
#include <stdint.h>
#include "ext2.h"
-#include "lib/logger/log.h"
#define FOOLOS_MODULE_NAME "elf"
#define EI_NIDENT 16
@@ -80,11 +79,11 @@ uint32_t load_elf(char *name, uint32_t *alloc)
//uint32_t vaddr=0x08000000;
uint32_t vaddr=0x08048000;
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"loading %s",name);
+ log(FOOLOS_MODULE_NAME,5,"loading %s",name);
ext2_check(ext2_ramimage);
ext2_inode_content(ext2_ramimage,inode_nr,vaddr,0x100000); // max ignored??
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"ELF File loaded to final destination.");
+ log(FOOLOS_MODULE_NAME,20,"ELF File loaded to final destination.");
Elf32_Ehdr *elf;
elf=vaddr;
@@ -94,27 +93,27 @@ uint32_t load_elf(char *name, uint32_t *alloc)
/*
- log(FOOLOS_MODULE_NAME, FOOLOS_LOG_INFO,
+ log(FOOLOS_MODULE_NAME, 5,
"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,FOOLOS_LOG_INFO,"elf type: 0x%04x",elf->e_type);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf machine: 0x%04x",elf->e_machine);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf version: %d",elf->e_version);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf entry: 0x%08X",elf->e_entry);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf ph-offset: 0x%08X",elf->e_phoff);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf sh-offset: 0x%08X",elf->e_shoff);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf flags: 0x%08X",elf->e_flags);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf eh-size (bytes): %d",elf->e_ehsize);
+ 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);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf ph-ent-size(bytes): %d",elf->e_phentsize);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf ph-num: %d",elf->e_phnum);
+ 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);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf sh-ent-size(byte): %d",elf->e_shentsize);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf sh-num: %d",elf->e_shnum);
+ 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);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"elf sh-strndx: %d",elf->e_shstrndx);
+ log(FOOLOS_MODULE_NAME,5,"elf sh-strndx: %d",elf->e_shstrndx);
*/
// iterate over section headers
@@ -124,7 +123,7 @@ uint32_t load_elf(char *name, uint32_t *alloc)
if(phidx==0)
{
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"text: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz);
+ log(FOOLOS_MODULE_NAME,20,"text: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz);
}
if(phidx==1)
@@ -132,17 +131,17 @@ uint32_t load_elf(char *name, uint32_t *alloc)
/*
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"-- PROGRAMM HEADER %d --",phidx+1);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-type: %d",phdr->p_type);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-offset: 0x%08X",phdr->p_offset);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-vaddr: 0x%08X",phdr->p_vaddr);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-filesz: 0x%08X",phdr->p_filesz);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"p-memsz: 0x%08X",phdr->p_memsz);
+ 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);
*/
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"data: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz);
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"bss: 0x%08X-0x%08X",phdr->p_vaddr+phdr->p_filesz,phdr->p_vaddr+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);
// let's copy the rw- data block
// from right to left so we not overwrite ourselves!!
@@ -168,7 +167,7 @@ uint32_t load_elf(char *name, uint32_t *alloc)
}
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"heap starts at: 0x%08X",*alloc);
+ log(FOOLOS_MODULE_NAME,20,"heap starts at: 0x%08X",*alloc);
return elf->e_entry;
}
diff --git a/fs/ext2.c b/fs/ext2.c
index c313775..e685938 100644
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -6,7 +6,6 @@
#include <stdbool.h>
#include <stdint.h>
-#include "lib/logger/log.h"
#include "fs.h"
#include "ext2.h"
@@ -119,7 +118,7 @@ int ext2_check(uint8_t *ram)
ram_read(ptr,&super,sizeof(super),1);
if(super.ext2_sig!=0xef53){
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"addr: 0x%08X",ram);
+ log(FOOLOS_MODULE_NAME,5,"addr: 0x%08X",ram);
panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected");
}
}
@@ -136,7 +135,7 @@ 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,FOOLOS_LOG_INFO,"addr: 0x%08X",ram);
+ log(FOOLOS_MODULE_NAME,5,"addr: 0x%08X",ram);
panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected!");
}
@@ -183,7 +182,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,FOOLOS_LOG_INFO,"bl: %d : %d / %d",block_idx,indirect1_idx, idx);
+ //log(FOOLOS_MODULE_NAME,5,"bl: %d : %d / %d",block_idx,indirect1_idx, idx);
return ext2_get_indirectstart(start,block_size,dil[indirect1_idx],idx);
}
@@ -200,7 +199,7 @@ int ext2_inode_content(char *ram,int inode_nr,uint8_t *ramdest,int max)
int sum=0;
int count=0;
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Loading %d.%d bytes",inode.size_high, inode.size_low);
+ log(FOOLOS_MODULE_NAME,5,"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.");
@@ -247,7 +246,7 @@ int ext2_inode_content(char *ram,int inode_nr,uint8_t *ramdest,int max)
}
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Fool Check Sum: 0x%08X for %d bytes",sum,count);
+ log(FOOLOS_MODULE_NAME,5,"Fool Check Sum: 0x%08X for %d bytes",sum,count);
}
@@ -265,7 +264,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,FOOLOS_LOG_DEBUG,"looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start);
+ log(FOOLOS_MODULE_NAME,20,"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
@@ -274,15 +273,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,FOOLOS_LOG_DEBUG,"found: %s (%s)",first,dirs[i].type==FS_FILE_TYPE_DIR?"dir":"file");
+ log(FOOLOS_MODULE_NAME,20,"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,FOOLOS_LOG_INFO,"no match: %s",dirs[i].name);
+ //log(FOOLOS_MODULE_NAME,5,"no match: %s",dirs[i].name);
}
- log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"file not found!");
+ log(FOOLOS_MODULE_NAME,5,"file not found!");
return -1;
@@ -306,7 +305,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,FOOLOS_LOG_DEBUG,"read_dir : max: %d",max);
+ log(FOOLOS_MODULE_NAME,20,"read_dir : max: %d",max);
ext2_inode inode=ext2_get_inode(ram,inode_nr);
char buf[256];
@@ -354,7 +353,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,FOOLOS_LOG_INFO,"name: %s\n",dirs[c].name);
+// log(FOOLOS_MODULE_NAME,5,"name: %s\n",dirs[c].name);
c++;
diff --git a/fs/fs.c b/fs/fs.c
index 74ed010..253be98 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -3,7 +3,6 @@
#include "fs.h"
#include "ext2.h"
-#include "lib/logger/log.h"
static uint32_t root_ext2_ramimage=0;
@@ -27,7 +26,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,FOOLOS_LOG_INFO,"mounting mod from 0x%08X-0x%08X : %s",
+ log(FOOLOS_MODULE_NAME,5,"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);
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-08 20:41:47 +0000