1) Add in IfrParser so that the FrameworkHii->GetDefaultImage can scan UEFI IFR opcod...

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiToUefiHiiThunk / HiiDatabase.h

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
index 662f8b04e833994dcb538045b5fb02540bb50b01..4ad98561411d8935e9c32b44f598ef0de90b2b3a 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
@@ -46,18 +46,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/HiiLib.h>\r
 #include <Library/ExtendedHiiLib.h>\r
 \r
-//\r
-// There are some type redefinitions between Framework Ifr Support Library and \r
-// UEFI HII Ifr Support Library. We undefine the duplicated Framework  definition here \r
-// so that the duplicated definitions in UEFI HII Ifr can be defined.\r
-// In this Thunk Module, we will access all Framework definition with "FRAMEWORK_" prefix.\r
-//\r
-#undef IFR_OPTION\r
-#undef EFI_HII_UPDATE_DATA\r
-\r
 #include <Library/IfrSupportLib.h>\r
 #include <Library/ExtendedIfrSupportLib.h>\r
 \r
+#include <MdeModuleHii.h>\r
+\r
 //\r
 // Macros\r
 //\r
@@ -147,11 +140,11 @@ typedef struct {
 //\r
 // Extern Variables\r
 //\r
-extern CONST EFI_HII_DATABASE_PROTOCOL            *mUefiHiiDatabaseProtocol;\r
-extern CONST EFI_HII_FONT_PROTOCOL                *mUefiHiiFontProtocol;\r
-extern CONST EFI_HII_IMAGE_PROTOCOL               *mUefiHiiImageProtocol;\r
-extern CONST EFI_HII_STRING_PROTOCOL              *mUefiStringProtocol;\r
-extern CONST EFI_HII_CONFIG_ROUTING_PROTOCOL      *mUefiConfigRoutingProtocol;\r
+extern CONST EFI_HII_DATABASE_PROTOCOL            *mHiiDatabase;\r
+extern CONST EFI_HII_FONT_PROTOCOL                *mHiiFontProtocol;\r
+extern CONST EFI_HII_IMAGE_PROTOCOL               *mHiiImageProtocol;\r
+extern CONST EFI_HII_STRING_PROTOCOL              *mHiiStringProtocol;\r
+extern CONST EFI_HII_CONFIG_ROUTING_PROTOCOL      *mHiiConfigRoutingProtocol;\r
 \r
 //\r
 // Prototypes\r