justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Move module loading in main into helper function

Browse Source
This commit is contained in:
Justin C. Miller
2020-03-02 19:43:44 -08:00
parent 884182217c
commit ec794f4f99
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/boot/main.cpp
View File

@@ -84,6 +84,23 @@ detect_debug_mode(EFI_RUNTIME_SERVICES *run, kernel_args *header) {
return EFI_SUCCESS; return EFI_SUCCESS;
} }
*/ */
void
load_module(
fs::file &disk,
kernel::args::header *args,
const wchar_t *name,
const wchar_t *path,
kernel::args::type type)
{
status_line status(L"Loading module", name);
fs::file file = disk.open(path);
kernel::args::module &module = args->modules[args->num_modules++];
module.type = type;
module.location = file.load(&module.size);
console::print(L" Loaded at: 0x%lx, %d bytes\r\n", module.location, module.size);
}
uefi::status uefi::status
bootloader_main_uefi(uefi::handle image, uefi::system_table *st, console &con) bootloader_main_uefi(uefi::handle image, uefi::system_table *st, console &con)
@@ -104,26 +121,8 @@ bootloader_main_uefi(uefi::handle image, uefi::system_table *st, console &con)
args->acpi_table = hw::find_acpi_table(st); args->acpi_table = hw::find_acpi_table(st);
fs::file disk = fs::get_boot_volume(image, bs); fs::file disk = fs::get_boot_volume(image, bs);
load_module(disk, args, L"initrd", L"initrd.img", kernel::args::type::initrd);
{ load_module(disk, args, L"kernel", L"jsix.elf", kernel::args::type::kernel);
status_line status(L"Loading modules");
{
status_line status(L"initrd");
fs::file file = disk.open(L"initrd.img");
kernel::args::module &module = args->modules[args->num_modules++];
module.type = kernel::args::type::initrd;
module.location = file.load(&module.size);
}
{
status_line status(L"kernel");
fs::file file = disk.open(L"jsix.elf");
kernel::args::module &module = args->modules[args->num_modules++];
module.type = kernel::args::type::kernel;
module.location = file.load(&module.size);
}
}
return uefi::status::success; return uefi::status::success;
} }