1) Use 0xFFEE as the VarId the reason is as follows:

// VARSTORE ID of 0 for Buffer Storage Type Storage is reserved in UEFI IFR form. But VARSTORE ID
// 0 in Framework IFR is the default VarStore ID for storage without explicit declaration. So we have
// to reseved 0xFFEE in UEFI VARSTORE ID to represetn default storage id in Framework IFR.
// Framework VFR has to be ported or pre-processed to change the default VARSTORE to a VARSTORE
// with ID equal to 0xFFEE.

2) Update some comments

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
index 5ccb1d64c786378bd8cff8a883d4395585209411..d0483c76bfd33a75434382ab9368e76b1231e52c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
@@ -1,6 +1,10 @@
 #/** @file\r
-# Component description file for HiiDatabase module which produce a Framework HII instance\r
-#  based on the avaliable UEFI HII protocol found in the platform.\r
+# Component description file for HiiDatabase module which produce a Framework HII Protocol instance\r
+# based on the avaliable UEFI HII protocol found in the platform. This modules enables modules complying\r
+# to Framework HII specification to able to run on a UEFI HII platform with only a rebuild. This is\r
+# to ensure that all HII packages are generated by UEFI HII package generation tools (UEFI VfrCompiler and\r
+# String Gather Tools). This thunk layer only produces the Frameowork HII protocol interface. The binary package\r
+# data format complying to UEFI HII specification.\r
 #\r
 # This module inits HII database and installs HII protocol based on the avaliable UEFI HII protocol found in the platform..\r
 # Copyright (c) 2006 - 2008, Intel Corporation\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
index fa01c3f7dc23c07923c2f61d58243242d9842f47..f33d63cfa4b2ba89c969a3e18a8bfecfc2afc912 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
@@ -502,6 +502,7 @@ GetBufferTypeDefaultIdAndStorageId (
   Node->Signature = UEFI_IFR_BUFFER_STORAGE_NODE_SIGNATURE;\r
   Node->Name      = AllocateCopyPool (StrSize (Storage->Name), Storage->Name);\r
   Node->DefaultId = DefaultStore->DefaultId;\r
+  Node->StoreId   = Storage->VarStoreId;\r
   CopyGuid (&Node->Guid, &Storage->Guid);\r
   Node->Size      = Storage->Size;\r
   Node->Buffer    = AllocateZeroPool (Node->Size);\r
@@ -710,13 +711,14 @@ UefiDefaultsToFrameworkDefaults (
       //\r
       if (Node->StoreId == RESERVED_VARSTORE_ID) {\r
         Pack->VariableId = 0;\r
+      } else {\r
+        Pack->VariableId = Node->StoreId;\r
       }\r
       //\r
       // Initialize EFI_HII_VARIABLE_PACK\r
       //\r
       Pack->Header.Type   = 0;\r
       Pack->Header.Length = Size;\r
-      Pack->VariableId = Node->StoreId;\r
       Pack->VariableNameLength = StrSize (Node->Name);\r
       CopyMem (&Pack->VariableGuid, &Node->Guid, sizeof (EFI_GUID));\r
       \r
@@ -749,9 +751,7 @@ UefiDefaultsToFrameworkDefaults (
                                               a UEFI form set.\r
                                              \r
 \r
-  @retval   EFI_SUCCESS                       Successful.\r
-  @retval   EFI_INVALID_PARAMETER      The default mask is not FRAMEWORK_EFI_IFR_FLAG_DEFAULT or \r
-                                                           FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING.\r
+  @retval   VOID\r
 **/\r
 VOID\r
 FreeDefaultList (\r