xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

XTLDR Rewrite #7

Merged
belliash merged 184 commits from xtldr_rewrite into master 2024-01-09 18:51:04 +01:00
Conversation 1 Commits 184 Files Changed 63 +38 -34
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 835d2f3551 - Show all commits

72
xtldr2/xtldr.c
View File

@ -374,42 +374,44 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
}
BlConsolePrint(L"\n\n\n\n\n\n\n\nList of loaded modules:");
PLIST_ENTRY ModuleListEntry;
PXTBL_MODULE_INFO ModuleInfo;
// BlConsolePrint(L"\n\n\n\n\n\n\n\nList of loaded modules:");
// PLIST_ENTRY ModuleListEntry;
// PXTBL_MODULE_INFO ModuleInfo;
ModuleListEntry = BlpLoadedModules.Flink;
while(ModuleListEntry != &BlpLoadedModules)
{
/* Get module information */
ModuleInfo = CONTAIN_RECORD(ModuleListEntry, XTBL_MODULE_INFO, Flink);
/* Module already loaded */
BlConsolePrint(L"\n%S", ModuleInfo->ModuleName);
if(ModuleInfo->ModuleDescription != 0)
{
BlConsolePrint(L" (%S)", ModuleInfo->ModuleDescription);
}
PLIST_ENTRY DepsListEntry;
PXTBL_MODULE_DEPS DepsInfo;
BlConsolePrint(L"\n - Uses: ");
DepsListEntry = ModuleInfo->Dependencies.Flink;
while(DepsListEntry != &ModuleInfo->Dependencies)
{
DepsInfo = CONTAIN_RECORD(DepsListEntry, XTBL_MODULE_DEPS, Flink);
BlConsolePrint(L"%S ", DepsInfo->ModuleName);
DepsListEntry = DepsListEntry->Flink;
}
/* Move to the module */
ModuleListEntry = ModuleListEntry->Flink;
}
BlConsolePrint(L"\n\n END OF LIST\n");
for(;;)
// ModuleListEntry = BlpLoadedModules.Flink;
// while(ModuleListEntry != &BlpLoadedModules)
// {
// /* Get module information */
// ModuleInfo = CONTAIN_RECORD(ModuleListEntry, XTBL_MODULE_INFO, Flink);
// /* Module already loaded */
// BlConsolePrint(L"\n%S", ModuleInfo->ModuleName);
// if(ModuleInfo->ModuleDescription != 0)
// {
// BlConsolePrint(L" (%S)", ModuleInfo->ModuleDescription);
// }
// PLIST_ENTRY DepsListEntry;
// PXTBL_MODULE_DEPS DepsInfo;
// BlConsolePrint(L"\n - Uses: ");
// DepsListEntry = ModuleInfo->Dependencies.Flink;
// while(DepsListEntry != &ModuleInfo->Dependencies)
// {
// DepsInfo = CONTAIN_RECORD(DepsListEntry, XTBL_MODULE_DEPS, Flink);
// BlConsolePrint(L"%S ", DepsInfo->ModuleName);
// DepsListEntry = DepsListEntry->Flink;
// }
// /* Move to the module */
// ModuleListEntry = ModuleListEntry->Flink;
// }
// BlConsolePrint(L"\n\n END OF LIST\n");
/* Main boot loader loop */
while(TRUE)
{
/* Check if custom boot menu registered */
if(BlpStatus.BootMenu != NULL)
{
/* Display alternative boot menu */
@ -420,6 +422,8 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
/* Display default boot menu */
BlDisplayBootMenu();
}
/* Fallback to shell, if boot menu returned */
}
/* This point should be never reached, if this happen return error code */