diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-21 08:51:15 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-21 08:51:15 +0000 |
| commit | c27eb3586138b96a6ff187952ab835d093c8fcb1 (patch) | |
| tree | deebfde2d7bab4334d3d3804cc3a6f01a3b049ab /MdeModulePkg/Universal/HiiDatabaseDxe | |
| parent | f8d18bada5af6d1f89cfc3cd50580d590a641e50 (diff) | |
| download | edk2-c27eb3586138b96a6ff187952ab835d093c8fcb1.zip edk2-c27eb3586138b96a6ff187952ab835d093c8fcb1.tar.gz edk2-c27eb3586138b96a6ff187952ab835d093c8fcb1.tar.bz2 | |
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).
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@5939 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/HiiDatabaseDxe')
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/Font.c | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c index 23b1547..e344414 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c @@ -2086,7 +2086,7 @@ HiiStringIdToImage ( if (Language != NULL) {
AsciiStrCpy (CurrentLang, (CHAR8 *) Language);
} else {
- HiiLibGetCurrentLanguage (CurrentLang);
+ GetCurrentLanguage (CurrentLang);
}
//
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h index 4b53e87..bbddd03 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h @@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/DevicePathLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/IfrSupportLib.h>
-#include <Library/HiiLib.h>
+#include <Library/UefiLib.h>
#include <Library/PcdLib.h>
#define HII_DATABASE_NOTIFY_GUID \
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf index 29cd5b4..d64a3f2 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf @@ -58,7 +58,7 @@ BaseMemoryLib
DebugLib
IfrSupportLib
- HiiLib
+ UefiLib
[Protocols]
gEfiConsoleControlProtocolGuid
|