diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/elf.c | 10 | ||||
| -rw-r--r-- | fs/ext2.c | 17 |
2 files changed, 14 insertions, 13 deletions
@@ -78,10 +78,10 @@ uint32_t load_elf(char *name, uint32_t *alloc) //load binary uint32_t vaddr=0x08048000; - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"loading"); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"loading %s",name); ext2_check(EXT2_RAM_ADDRESS); ext2_inode_content(EXT2_RAM_ADDRESS,inode_nr,vaddr,0x100000); // load 1mb; - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"ELF File loaded to final destination."); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"ELF File loaded to final destination."); Elf32_Ehdr *elf; elf=vaddr; @@ -121,7 +121,7 @@ uint32_t load_elf(char *name, uint32_t *alloc) if(phidx==0) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"text: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"text: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz); } if(phidx==1) @@ -138,8 +138,8 @@ uint32_t load_elf(char *name, uint32_t *alloc) */ - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"data: 0x%08X-0x%08X",phdr->p_vaddr,phdr->p_vaddr+phdr->p_filesz); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"bss: 0x%08X-0x%08X",phdr->p_vaddr+phdr->p_filesz,phdr->p_vaddr+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); // let's copy the rw- data block uint32_t *data=vaddr+phdr->p_offset; @@ -118,9 +118,10 @@ int ext2_check(uint8_t *ram) ext2_superblock_ext super_ext; uint8_t *ptr=ram+1024; ram_read(ptr,&super,sizeof(super),1); - if(super.ext2_sig!=0xef53)log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"no ext2 signature found, where ram-image expected!"); - //check version and req features. - // + + if(super.ext2_sig!=0xef53){ + panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected!"); + } } ext2_inode ext2_get_inode(uint8_t *ram,int inode_num) @@ -133,7 +134,7 @@ ext2_inode ext2_get_inode(uint8_t *ram,int inode_num) uint8_t *ptr=ram+1024; ram_read(ptr,&super,sizeof(super),1); - if(super.ext2_sig!=0xef53)log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"no ext2 signature found, where ram-image expected!"); + if(super.ext2_sig!=0xef53)panic(FOOLOS_MODULE_NAME,"no ext2 signature found, where ram-image expected!"); int block_group=(inode_num-1)/super.inodes_per_group; @@ -241,7 +242,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,FOOLOS_LOG_DEBUG,"Fool Check Sum: 0x%08X for %d bytes",sum,count); } @@ -259,7 +260,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_INFO,"looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"looking for %s '%s' in inode: %d",final?"file":"dir",first,inode_start); fs_dirent dirs[15]; int count= ext2_read_dir(ram, inode_start,dirs,15); // get dir @@ -268,7 +269,7 @@ int ext2_filename_to_inode_traverse(uint8_t *ram, char *path,int inode_start) { if(true==strcmp(first,dirs[i].name,0)) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"found: %s (%s)",first,dirs[i].type==FS_FILE_TYPE_DIR?"dir":"file"); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"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); } @@ -299,7 +300,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_INFO,"read_dir : max: %d",max); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"read_dir : max: %d",max); ext2_inode inode=ext2_get_inode(ram,inode_nr); char buf[256]; |