XTLDR Rewrite #7

Merged
belliash merged 184 commits from xtldr_rewrite into master 2024-01-09 18:51:04 +01:00
3 changed files with 12 additions and 6 deletions
Showing only changes of commit a079423174 - Show all commits

View File

@ -114,12 +114,12 @@ EFI_STATUS
BlpLoadConfiguration()
{
PLIST_ENTRY SectionListEntry;
STATIC LIST_ENTRY Configuration;
// STATIC LIST_ENTRY BlpConfiguration;
EFI_STATUS Status;
PCHAR ConfigData;
/* Initialize configuration pointer */
RtlInitializeListHead(&Configuration);
RtlInitializeListHead(&BlpConfiguration);
/* Read data from configuration file */
Status = BlpReadConfigFile(L"\\EFI\\BOOT\\", L"XTLDR.INI", &ConfigData);
@ -131,7 +131,7 @@ BlpLoadConfiguration()
}
/* Parse configuration data */
Status = BlpParseConfigFile(ConfigData, &Configuration);
Status = BlpParseConfigFile(ConfigData, &BlpConfiguration);
if(Status != STATUS_EFI_SUCCESS)
{
/* Failed to parse configuration */
@ -140,8 +140,8 @@ BlpLoadConfiguration()
}
/* Iterate through config sections */
SectionListEntry = Configuration.Flink;
while(SectionListEntry != &Configuration)
SectionListEntry = BlpConfiguration.Flink;
while(SectionListEntry != &BlpConfiguration)
{
/* Get config section */
PXTBL_CONFIG_SECTION Section = CONTAIN_RECORD(SectionListEntry, XTBL_CONFIG_SECTION, Flink);
@ -162,7 +162,7 @@ BlpLoadConfiguration()
}
/* Update boot menu OS list */
BlpMenuList = &Configuration;
BlpMenuList = &BlpConfiguration;
/* Return success */
return STATUS_EFI_SUCCESS;

View File

@ -12,6 +12,9 @@
/* XT Boot Loader configuration list */
PLIST_ENTRY BlpConfig = NULL;
/* XT Boot Loader loaded configuration */
LIST_ENTRY BlpConfiguration;
/* XT Boot Loader debug port configuration */
ULONG BlpDebugPort = 0;

View File

@ -15,6 +15,9 @@
/* XT Boot Loader configuration list */
EXTERN PLIST_ENTRY BlpConfig;
/* XT Boot Loader loaded configuration */
EXTERN LIST_ENTRY BlpConfiguration;
/* XT Boot Loader debug port configuration */
EXTERN ULONG BlpDebugPort;