aboutsummaryrefslogtreecommitdiff
path: root/src/kernel
diff options
context:
space:
mode:
authorMarvin Borner2020-04-25 19:45:47 +0200
committerMarvin Borner2020-04-25 19:45:47 +0200
commit4d46d6bb37c97050980ec5d0c29ee03e82cf9b63 (patch)
tree3c5105638c301b6f0d31abe4d8e73c79cff8054f /src/kernel
parent71a111f7e6b71e0894b90e8dc1221b1ec4f84ab3 (diff)
Fixed ext2 reading by using genext2fs
As the debian versions use a horribly old version of genext2fs, this program gets compiled in the build process now.
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/fs/ext2.c4
-rw-r--r--src/kernel/fs/ext2.h2
-rw-r--r--src/kernel/fs/load.c2
-rw-r--r--src/kernel/graphics/vesa.c2
-rw-r--r--src/kernel/kernel.c4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel/fs/ext2.c b/src/kernel/fs/ext2.c
index 4e7a384..afab33d 100644
--- a/src/kernel/fs/ext2.c
+++ b/src/kernel/fs/ext2.c
@@ -241,7 +241,7 @@ uint8_t *read_file(char *path)
ext2_open_inode(inode, &file);
if (inode != 0) {
size_t size = file.inode.size;
- debug("%d", size);
+ debug("%dKiB", size >> 10);
uint8_t *buf = kmalloc(size);
ext2_read(&file, buf, size);
kfree(file.buf);
@@ -251,4 +251,4 @@ uint8_t *read_file(char *path)
warn("File not found");
return NULL;
}
-}
+} \ No newline at end of file
diff --git a/src/kernel/fs/ext2.h b/src/kernel/fs/ext2.h
index 7fbe493..88515a3 100644
--- a/src/kernel/fs/ext2.h
+++ b/src/kernel/fs/ext2.h
@@ -139,4 +139,4 @@ uint32_t ext2_look_up_path(char *path);
uint8_t *read_file(char *path);
-#endif
+#endif \ No newline at end of file
diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c
index 09e6dbc..59bb905 100644
--- a/src/kernel/fs/load.c
+++ b/src/kernel/fs/load.c
@@ -10,4 +10,4 @@ void load_binaries()
font = (struct font *)read_file("/bin/font");
log("Successfully loaded binaries");
-}
+} \ No newline at end of file
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index d7bc42a..e8ef0e0 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -368,4 +368,4 @@ void vesa_set_color(uint32_t color)
{
vesa_convert_color(terminal_color, color);
vesa_convert_color(terminal_background, default_background_color);
-}
+} \ No newline at end of file
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 881361f..c5137bd 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -58,7 +58,7 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address)
ata_init();
ext2_init_fs();
- // log("%s", read_file("/etc/test")); // Multiple reads don't work?!
+ log("%s", read_file("/etc/test"));
load_binaries();
set_optimal_resolution();
@@ -79,4 +79,4 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address)
// panic("This should NOT happen!");
// asm ("div %0" :: "r"(0)); // Exception testing x/0
-}
+} \ No newline at end of file