summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-05-06 13:21:53 -0400
committerFreya Murphy <freya@freyacat.org>2025-05-06 13:21:53 -0400
commitf14e707144e805611ea01a8f2fd7f1e1beeb65c1 (patch)
tree2e5d447ef7fc9f2d3061b33e956cbdb1b69fb722
parentset pit into mode3 (fixes uefi) (diff)
downloadcomus-f14e707144e805611ea01a8f2fd7f1e1beeb65c1.tar.gz
comus-f14e707144e805611ea01a8f2fd7f1e1beeb65c1.tar.bz2
comus-f14e707144e805611ea01a8f2fd7f1e1beeb65c1.zip
-rw-r--r--config/grub.cfg3
-rw-r--r--kernel/user.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/config/grub.cfg b/config/grub.cfg
index 82c5db7..13c5167 100644
--- a/config/grub.cfg
+++ b/config/grub.cfg
@@ -1,9 +1,8 @@
set timeout=1
set default=0
insmod all_video
-insmod normal
menuentry "kern" {
multiboot2 /boot/kernel
- # module2 /boot/initrd.tar
+ module2 /boot/initrd.tar
}
diff --git a/kernel/user.c b/kernel/user.c
index 97d8f0f..27b46df 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -79,6 +79,7 @@ static int user_load_segment(struct pcb *pcb, struct file *file, int idx)
ERROR("Could not load elf segment");
return 1;
}
+ TRACE("Read %zu bytes", read);
memcpyv(mapADDR + total_read, load_buffer, read);
total_read += read;
}