sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HiiLibGetCurrentLanguage returns the current UEFI variable "PlatformLang" (if this variable does not exist, a default value is returned). This function is called by HiiDatabase itself. Now, HiiLibGetCurrentLanguage is in HiiLib. Because of this, we can't add location of Hii protoocol in the library constructor of HiiLib. This cause Hii Database driver never get loaded (circular dependency).

Browse Source 
By moving HiiLibGetCurrentLanguage to UefiLib, library constructor (depex) can be added back to HiiLib to make sure the execution order is correct.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5938 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12
2008-09-21 08:50:52 +00:00
parent c0522bd7df
commit f8d18bada5
10 changed files with 108 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
MdePkg/Library/HiiLib/HiiLib.c
View File

@@ -18,29 +18,35 @@ CONST EFI_HII_DATABASE_PROTOCOL *mHiiDatabaseProt = NULL;
CONST EFI_HII_STRING_PROTOCOL *mHiiStringProt = NULL;
/**
This function locate Hii relative protocols for later usage.
The constructor function caches the protocol pointer of HII Database Protocol
and Hii String Protocol.
It will ASSERT() if either of the protocol can't be located.
@param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
@retval EFI_SUCCESS The constructor always returns EFI_SUCCESS.
**/
VOID
LocateHiiProtocols (
VOID
EFI_STATUS
EFIAPI
HiiLibConstructor (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
if (mHiiStringProt != NULL && mHiiDatabaseProt != NULL) {
//
// Only need to initialize the protocol instance once.
//
return;
}
Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &mHiiDatabaseProt);
ASSERT_EFI_ERROR (Status);
Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &mHiiStringProt);
ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS;
}
@@ -213,8 +219,6 @@ HiiLibAddPackages (
ASSERT (HiiHandle != NULL);
LocateHiiProtocols ();
VA_START (Args, HiiHandle);
PackageListHeader = InternalHiiLibPreparePackages (NumberOfPackages, GuidId, Args);
@@ -250,8 +254,6 @@ HiiLibRemovePackages (
EFI_STATUS Status;
ASSERT (IsHiiHandleRegistered (HiiHandle));
LocateHiiProtocols ();
Status = mHiiDatabaseProt->RemovePackageList (mHiiDatabaseProt, HiiHandle);
ASSERT_EFI_ERROR (Status);
}
@@ -287,8 +289,6 @@ HiiLibGetHiiHandles (
BufferLength = 0;
LocateHiiProtocols ();
//
// Try to find the actual buffer size for HiiHandle Buffer.
//
@@ -353,8 +353,6 @@ HiiLibExtractGuidFromHiiHandle (
BufferSize = 0;
HiiPackageList = NULL;
LocateHiiProtocols ();
Status = mHiiDatabaseProt->ExportPackageLists (mHiiDatabaseProt, Handle, &BufferSize, HiiPackageList);
ASSERT (Status != EFI_NOT_FOUND);
@@ -450,8 +448,6 @@ HiiLibDevicePathToHiiHandle (
return NULL;
}
LocateHiiProtocols ();
//
// Retrieve all Hii Handles from HII database
//
@@ -538,8 +534,6 @@ HiiLibExportPackageLists (
ASSERT (PackageListSize != NULL);
ASSERT (PackageListHeader != NULL);
LocateHiiProtocols ();
if (Handle != NULL) {
ASSERT (IsHiiHandleRegistered (Handle));
}
@@ -597,8 +591,6 @@ HiiLibListPackageLists (
*HandleBufferLength = 0;
*HandleBuffer = NULL;
LocateHiiProtocols ();
Status = mHiiDatabaseProt->ListPackageLists (
mHiiDatabaseProt,
PackageType,
@@ -652,8 +644,6 @@ IsHiiHandleRegistered (
HiiPackageList = NULL;
BufferSize = 0;
LocateHiiProtocols ();
Status = mHiiDatabaseProt->ExportPackageLists (
mHiiDatabaseProt,
HiiHandle,