Update FrameworkHiiToUefiHiiThunk to produce Framework HII Protocol and Framework...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5801 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
index 68b3bead20dbcd149c2da36353497659f1a0146a..f555e86b84043d7ede2a0dd86ab596881cb40099 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
@@ -85,7 +85,6 @@
   PrintLib\r
 \r
 [Protocols]\r
-  gEfiHiiProtocolGuid\r
   gEfiHiiImageProtocolGuid\r
   gEfiHiiDatabaseProtocolGuid\r
   gEfiHiiStringProtocolGuid\r
@@ -94,7 +93,8 @@
   gEfiHiiConfigAccessProtocolGuid\r
   gEfiFormCallbackProtocolGuid\r
   gEfiUnicodeCollation2ProtocolGuid\r
-  gEfiFormBrowserProtocolGuid\r
+  gEfiHiiCompatibilityProtocolGuid\r
+  gEfiFormBrowserCompatibilityProtocolGuid\r
 \r
 [Depex]\r
   gEfiHiiDatabaseProtocolGuid AND\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
index b53beb1ed4833a780d381c9d3cffa5b8ced61da7..845a9f72e0c84918f3a48edafe08ec2d4a50a1d9 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
@@ -104,7 +104,8 @@ Returns:
   HII_THUNK_CONTEXT       *ThunkContext;\r
   \r
 \r
-  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiProtocolGuid);\r
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiCompatibilityProtocolGuid);\r
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiFormBrowserCompatibilityProtocolGuid);\r
 \r
   Private = AllocateCopyPool (sizeof (HII_THUNK_PRIVATE_DATA), &mHiiThunkPrivateDataTempate);\r
   ASSERT (Private != NULL);\r
@@ -158,7 +159,7 @@ Returns:
   //\r
   Status = gBS->InstallProtocolInterface (\r
                   &Private->Handle,\r
-                  &gEfiHiiProtocolGuid,\r
+                  &gEfiHiiCompatibilityProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   (VOID *) &Private->Hii\r
                   );\r
@@ -229,7 +230,7 @@ Returns:
   mBrowserThunkPrivateDataTemplate.ThunkPrivate = Private;\r
   Status = gBS->InstallProtocolInterface (\r
                   &mBrowserThunkPrivateDataTemplate.Handle,\r
-                  &gEfiFormBrowserProtocolGuid,\r
+                  &gEfiFormBrowserCompatibilityProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   (VOID *) &mBrowserThunkPrivateDataTemplate.FormBrowser\r
                   );\r