Aren
/
rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multiboot1&2: Move kernel loading message to after detection code

This commit is contained in:
mintsuki 2021-11-25 23:06:34 +01:00
parent 2f844f3f48
commit 5da7b1fcdc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stage23/protos/multiboot1.c
View File

@ -28,8 +28,6 @@ bool multiboot1_load(char *config, char *cmdline) {
if (kernel_path == NULL)
panic("multiboot1: KERNEL_PATH not specified");
print("multiboot1: Loading kernel `%s`...\n", kernel_path);
if ((kernel_file = uri_open(kernel_path)) == NULL)
panic("multiboot1: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
@ -57,6 +55,8 @@ bool multiboot1_load(char *config, char *cmdline) {
return false;
}
print("multiboot1: Loading kernel `%s`...\n", kernel_path);
struct multiboot1_info *multiboot1_info = conv_mem_alloc(sizeof(struct multiboot1_info));
if (header.magic + header.flags + header.checksum)

4
stage23/protos/multiboot2.c
View File

@ -59,8 +59,6 @@ bool multiboot2_load(char *config, char* cmdline) {
if (kernel_path == NULL)
panic("multiboot2: KERNEL_PATH not specified");
print("multiboot2: Loading kernel `%s`...\n", kernel_path);
if ((kernel_file = uri_open(kernel_path)) == NULL)
panic("multiboot2: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
@ -85,6 +83,8 @@ bool multiboot2_load(char *config, char* cmdline) {
return false;
}
print("multiboot2: Loading kernel `%s`...\n", kernel_path);
if (header->magic + header->architecture + header->checksum + header->header_length) {
panic("multiboot2: Header checksum is invalid");
}