1) Add in support to get only VarStoreId = 1 from Multiple VarStores.

2) Remove ThunkIfrSupportLib.h
3) Update some comments.
4) Add GetAttributesOfFirstFormSet to scan form package to read formset title, class info.
5) Clean up function related to package registration code.
6) Clean up RemovePackNotify

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

1 files changed, 2 insertions, 5 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
index cf43572ab7..6359c8e680 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
@@ -717,7 +717,7 @@ typedef struct {
 

 EFI_STATUS

 F2UCreateNumericOpCode (

-  IN       HII_THUNK_CONTEXT               *ThunkContext,

+  IN       HII_THUNK_CONTEXT           *ThunkContext,

   IN       UINT16                      VarStoreId,

   IN CONST FRAMEWORK_EFI_IFR_NUMERIC   *FwOpcode,

   OUT      EFI_HII_UPDATE_DATA         *UefiData

@@ -755,10 +755,7 @@ F2UCreateNumericOpCode (
   UOpcode.Question.Header.Help = FwOpcode->Help;

 

   UOpcode.Question.QuestionId    = FwOpcode->Key;

-  //

-  // BUGBUG RESERVED_VARSTORE_ID should be passed in.

-  //

-  UOpcode.Question.VarStoreId    = RESERVED_VARSTORE_ID;

+  UOpcode.Question.VarStoreId    = VarStoreId;

   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;

 

   UOpcode.Question.Flags  = (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));