aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/fs
diff options
context:
space:
mode:
authorMarvin Borner2020-04-21 00:37:02 +0200
committerMarvin Borner2020-04-21 00:45:47 +0200
commitc83104329214bd618444d6e0242bb0317f52dbbc (patch)
tree8f884d12483f21e94ace5b60d353ad9c8fc14a7c /src/kernel/fs
parent62b27d5307b1ac019a0a3a27fe947cccff8875f6 (diff)
Finally! EXT2 is working now :)
Puuh.
Diffstat (limited to 'src/kernel/fs')
-rw-r--r--src/kernel/fs/ext2.c5
-rw-r--r--src/kernel/fs/load.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/kernel/fs/ext2.c b/src/kernel/fs/ext2.c
index 7ce0601..c95c134 100644
--- a/src/kernel/fs/ext2.c
+++ b/src/kernel/fs/ext2.c
@@ -36,7 +36,7 @@ void ext2_init_fs()
struct ext2_dirent dirent;
while (ext2_next_dirent(&file, &dirent))
- log("Inode %d, name `%s'", dirent.inode_num, dirent.name);
+ log("Inode %d, name '%s'", dirent.inode_num, dirent.name);
kfree(file.buf);
@@ -46,7 +46,6 @@ void ext2_init_fs()
log("File not found");
else
log("Found: inode = %d", inode);
- panic("nice");
}
static void read_block(uint32_t block_num, void *buf)
@@ -70,7 +69,7 @@ static void load_superblock()
assert(superblock.signature == EXT2_SIGNATURE);
log("Total inodes = 0x%x", superblock.total_inodes);
log("Total blocks = 0x%x", superblock.total_blocks);
- log("Block size = %b", block_size);
+ log("Block size = %d", block_size);
log("Num blocks = %d", superblock.total_blocks);
log("Blocks/group = %d", superblock.blocks_per_group);
log("Inodes/group = %d", superblock.inodes_per_group);
diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c
index 7f5340a..9aca1c3 100644
--- a/src/kernel/fs/load.c
+++ b/src/kernel/fs/load.c
@@ -31,5 +31,5 @@ void load_binaries()
halt_loop();
}
}*/
- vga_log("Successfully loaded binaries");
+ log("Successfully loaded binaries");
} \ No newline at end of file