diff --git a/xtldr2/config.c b/xtldr2/config.c index 9925bcd..e7e0a3e 100644 --- a/xtldr2/config.c +++ b/xtldr2/config.c @@ -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; diff --git a/xtldr2/globals.c b/xtldr2/globals.c index 1d38120..9fe0c5c 100644 --- a/xtldr2/globals.c +++ b/xtldr2/globals.c @@ -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; diff --git a/xtldr2/includes/globals.h b/xtldr2/includes/globals.h index 1db2504..0b9074a 100644 --- a/xtldr2/includes/globals.h +++ b/xtldr2/includes/globals.h @@ -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;