DeforaOS/uKernel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow kernels without modules to start

Browse Source
This commit is contained in:
Pierre Pronchery 2018-06-21 02:04:47 +02:00
parent b05c58c8f8
commit 1020b7c0fb
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/kernel/multiboot.c
View File

@ -64,12 +64,7 @@ int multiboot(ukMultibootInfo * mi)
(mi->mem_upper - mi->mem_lower) / 1024);
printf("Booted from %#x\n", mi->boot_device_drive);
/* look for modules */
if(!(mi->flags & BOOT_MULTIBOOT_INFO_HAS_MODS))
{
puts("No modules provided");
return 2;
}
/* load the modules */
#if defined(__amd64__)
if(_arch_setgdt64(_gdt_4gb, sizeof(_gdt_4gb) / sizeof(*_gdt_4gb)) != 0)
#else
@ -77,15 +72,19 @@ int multiboot(ukMultibootInfo * mi)
#endif
{
puts("Could not setup the GDT");
return 4;
return 2;
}
/* load the modules */
puts("Loading modules...");
for(i = 0; i < mi->mods_count; i++)
if(!(mi->flags & BOOT_MULTIBOOT_INFO_HAS_MODS))
puts("No modules provided");
else
{
mod = &mi->mods_addr[i];
multiboot_load_module(mod, NULL, NULL);
puts("Loading modules...");
for(i = 0; i < mi->mods_count; i++)
{
mod = &mi->mods_addr[i];
multiboot_load_module(mod, NULL, NULL);
}
}
return 0;
}