Update FrameworkHiiOnUefiHiiThunk to use new HII library.

And add the internal CreateRawOpCode API for the unsupported OpCode: String and Ref.

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

1 files changed, 8 insertions, 13 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 8a999b315c..2c8b7adaba 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -46,9 +46,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiRuntimeServicesTableLib.h>

 #include <Library/HiiLib.h>

 #include <Library/UefiLib.h>

-

-#include <Library/IfrSupportLib.h>

-#include <Library/ExtendedIfrSupportLib.h>

 #include <Library/PcdLib.h>

 

 #include <Guid/MdeModuleHii.h>

@@ -73,8 +70,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///

 #define ISO_639_2_ENTRY_SIZE            3

 

-

-

 #pragma pack (1)

 typedef struct {

   EFI_HII_PACK_HEADER     FrameworkPackageHeader;

@@ -421,12 +416,12 @@ ThunkSendForm (
 EFI_STATUS

 EFIAPI 

 ThunkCreatePopUp (

-  IN  UINTN                           NumberOfLines,

+  IN  UINTN                           LinesNumber,

   IN  BOOLEAN                         HotKey,

   IN  UINTN                           MaximumStringSize,

   OUT CHAR16                          *StringBuffer,

-  OUT EFI_INPUT_KEY                   *KeyValue,

-  IN  CHAR16                          *String,

+  OUT EFI_INPUT_KEY                   *Key,

+  IN  CHAR16                          *FirstString,

   ...

   );

 

@@ -451,11 +446,11 @@ NewOrAddPackNotify (
   );

 

 /**

-  Create a EFI_HII_UPDATE_DATA structure used to call IfrLibUpdateForm.

+  Create a Hii Update data Handle used to call IfrLibUpdateForm.

 

-  @param ThunkContext   The HII Thunk Context.

-  @param FwUpdateData   The Framework Update Data.

-  @param UefiUpdateData The UEFI Update Data.

+  @param ThunkContext         The HII Thunk Context.

+  @param FwUpdateData         The Framework Update Data.

+  @param UefiOpCodeHandle     The UEFI Update Data.

 

   @retval EFI_SUCCESS       The UEFI Update Data is created successfully.

   @retval EFI_UNSUPPORTED   There is unsupported opcode in FwUpdateData.

@@ -465,7 +460,7 @@ EFI_STATUS
 FwUpdateDataToUefiUpdateData (

   IN       HII_THUNK_CONTEXT                *ThunkContext,

   IN CONST FRAMEWORK_EFI_HII_UPDATE_DATA    *FwUpdateData,

-  OUT      EFI_HII_UPDATE_DATA              **UefiUpdateData

+  IN       VOID                             *UefiOpCodeHandle

   )

 ;