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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
index d6165b3dec34d4c452108ee421f6148f44d5bbcd..b5f4bf4bc00438ab17416bc8b7c9db227900200f 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
@@ -398,6 +398,31 @@ GetUefiVariable (
   return Status;\r
 }\r
 \r
+BUFFER_STORAGE_ENTRY *\r
+GetBufferStorageEntry (\r
+  IN      CONFIG_ACCESS_PRIVATE       *ConfigAccess,\r
+  IN      UINT16                      VarStoreId\r
+  )\r
+{\r
+  LIST_ENTRY                                  *Link;\r
+  BUFFER_STORAGE_ENTRY                        *BufferStorage;\r
+\r
+  Link = GetFirstNode (&ConfigAccess->BufferStorageListHead);\r
+\r
+  while (!IsNull (&ConfigAccess->BufferStorageListHead, Link)) {\r
+    BufferStorage = BUFFER_STORAGE_ENTRY_FROM_LINK (Link);\r
+\r
+    if (BufferStorage->VarStoreId == VarStoreId) {\r
+      return BufferStorage;\r
+    }\r
+\r
+    Link = GetNextNode (&ConfigAccess->BufferStorageListHead, Link);\r
+  }\r
+\r
+  return NULL;\r
+}\r
+\r
+\r
 /**\r
 \r
   This function implement the EFI_HII_CONFIG_ACCESS_PROTOCOL.ExtractConfig\r
@@ -432,7 +457,6 @@ ThunkExtractConfig (
 {\r
   EFI_STATUS                                  Status;\r
   CONFIG_ACCESS_PRIVATE                       *ConfigAccess;\r
-  LIST_ENTRY                                  *Link;\r
   BUFFER_STORAGE_ENTRY                        *BufferStorage;\r
   VOID                                        *Data;\r
   UINTN                                       DataSize;\r
@@ -443,13 +467,7 @@ ThunkExtractConfig (
   //\r
   // For now, only one var varstore is supported so that we don't need to parse the Configuration string.\r
   //\r
-  Link = GetFirstNode (&ConfigAccess->BufferStorageListHead);\r
-  if (Link == NULL) {\r
-    ASSERT (FALSE);\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-  \r
-  BufferStorage = BUFFER_STORAGE_ENTRY_FROM_LINK (Link);\r
+  BufferStorage = GetBufferStorageEntry (ConfigAccess, (UINT16) RESERVED_VARSTORE_ID);\r
 \r
   if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {\r
     if (ConfigAccess->FormCallbackProtocol == NULL ||\r
@@ -519,7 +537,6 @@ ThunkRouteConfig (
 {\r
   EFI_STATUS                                  Status;\r
   CONFIG_ACCESS_PRIVATE                       *ConfigAccess;\r
-  LIST_ENTRY                                  *Link;\r
   BUFFER_STORAGE_ENTRY                        *BufferStorage;\r
   UINT8                                       *Data;\r
   UINTN                                       DataSize;\r
@@ -534,13 +551,8 @@ ThunkRouteConfig (
   //\r
   // For now, only one var varstore is supported so that we don't need to parse the Configuration string.\r
   //\r
-  Link = GetFirstNode (&ConfigAccess->BufferStorageListHead);\r
-  if (Link == NULL) {\r
-    ASSERT (FALSE);\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
+  BufferStorage = GetBufferStorageEntry (ConfigAccess, (UINT16) RESERVED_VARSTORE_ID);\r
 \r
-  BufferStorage = BUFFER_STORAGE_ENTRY_FROM_LINK (Link);\r
   DataSize2     = BufferStorage->Size;\r
   if (ConfigAccess->ThunkContext->NvMapOverride == NULL) {\r
     DataAllocated = TRUE;\r
@@ -901,17 +913,10 @@ ThunkCallback (
   //\r
   if (EFI_ERROR (Status)) {\r
     if (Packet != NULL) {\r
-      //\r
-      // BUGBUG: need to restore the changing question to default value\r
-      //\r
-\r
       do {\r
         IfrLibCreatePopUp (1, &Key, Packet->String);\r
-\r
       } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-      \r
     }\r
-\r
     //\r
     // Error Code in Status is discarded.\r
     //\r
@@ -943,7 +948,7 @@ ThunkCallback (
                            NotifyHandle\r
                            );\r
   //\r
-  // UEFI SetupBrowser handles scenario differently with Framework SetupBrowser when call back function \r
+  // UEFI SetupBrowser behaves differently with Framework SetupBrowser when call back function \r
   // update any forms in HII database. UEFI SetupBrowser will re-parse the displaying form package and load\r
   // the values from variable storages. Framework SetupBrowser will only re-parse the displaying form packages.\r
   // To make sure customer's previous changes is saved and the changing question behaves as expected, we\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
index 34a89b1b0879d14d9bf8e125f45d538c42c90813..49c82b91df40021a05a25a07ec88432ffad966ad 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
@@ -1,5 +1,4 @@
 /**@file\r
-\r
   This file contains the Glyph related function.\r
 \r
 Copyright (c) 2006 - 2008, Intel Corporation\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
index 45ccfdb1717536ffc364f858611731a04893695f..3679f6dfb452016cab51bc34c05c75193221da67 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
@@ -38,8 +38,7 @@ FW_HII_FORMSET_TEMPLATE FormSetTemplate = {
       FRAMEWORK_EFI_IFR_FORM_SET_OP,\r
       sizeof (FRAMEWORK_EFI_IFR_FORM_SET)\r
     },\r
-    //Guid\r
-    {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}},\r
+    {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}, //Guid\r
     0,\r
     0,\r
     0,\r
@@ -116,11 +115,11 @@ HiiExportDatabase (
 EFI_STATUS\r
 EFIAPI\r
 HiiGetForms (\r
-  IN     EFI_HII_PROTOCOL   *This,\r
-  IN     FRAMEWORK_EFI_HII_HANDLE      Handle,\r
-  IN     EFI_FORM_ID        FormId,\r
-  IN OUT UINTN              *BufferLengthTemp,\r
-  OUT    UINT8              *Buffer\r
+  IN     EFI_HII_PROTOCOL             *This,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE     Handle,\r
+  IN     EFI_FORM_ID                  FormId,\r
+  IN OUT UINTN                        *BufferLengthTemp,\r
+  OUT    UINT8                        *Buffer\r
   )\r
 {\r
   HII_THUNK_PRIVATE_DATA                *Private;\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
index 3fc839ae89ea6bccf67e8c3900230b1cbfebf5ea..b53beb1ed4833a780d381c9d3cffa5b8ced61da7 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
@@ -45,7 +45,10 @@ HII_THUNK_PRIVATE_DATA mHiiThunkPrivateDataTempate = {
   },\r
 \r
   {\r
-    NULL, NULL                  //HiiHandleLinkList\r
+    ///\r
+    /// HiiHandleLinkList\r
+    ///\r
+    NULL, NULL                  \r
   },\r
 };\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
index 55d1859faf6d6b04f0e397edb0e9535f5227d35b..e165d74855fe085ce9be5f2b916b9284139fb4e7 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
@@ -1,7 +1,7 @@
 /**@file\r
 \r
   This file contains global defines and prototype definitions\r
-  for the HII database.\r
+  for the Framework HII to Uefi HII Thunk Module.\r
   \r
 Copyright (c) 2006 - 2008, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -51,6 +51,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <MdeModuleHii.h>\r
 \r
+\r
+//\r
+// VARSTORE ID of 0 for Buffer Storage Type Storage is reserved in UEFI IFR form. But VARSTORE ID\r
+// 0 in Framework IFR is the default VarStore ID for storage without explicit declaration. So we have\r
+// to reseved 0x0001 in UEFI VARSTORE ID to represetn default storage id in Framework IFR.\r
+// Framework VFR has to be ported or pre-processed to change the default VARSTORE to a VARSTORE\r
+// with ID equal to 0x0001.\r
+//\r
+#define RESERVED_VARSTORE_ID 0x0001\r
+\r
+\r
 #pragma pack (push, 1)\r
 typedef struct {\r
   UINT32                  BinaryLength;\r
@@ -79,11 +90,11 @@ typedef struct {
 #define ONE_OF_OPTION_MAP_ENTRY_FROM_LINK(Record) CR(Record, ONE_OF_OPTION_MAP_ENTRY, Link, ONE_OF_OPTION_MAP_ENTRY_SIGNATURE)\r
 #define ONE_OF_OPTION_MAP_ENTRY_SIGNATURE            EFI_SIGNATURE_32 ('O', 'O', 'M', 'E')\r
 typedef struct {\r
-  UINT32          Signature;\r
-  LIST_ENTRY      Link;\r
+  UINT32              Signature;\r
+  LIST_ENTRY          Link;\r
 \r
-  UINT16             FwKey;\r
-  EFI_IFR_TYPE_VALUE Value;\r
+  UINT16              FwKey;\r
+  EFI_IFR_TYPE_VALUE  Value;\r
   \r
 } ONE_OF_OPTION_MAP_ENTRY;\r
 \r
@@ -92,14 +103,14 @@ typedef struct {
 #define ONE_OF_OPTION_MAP_FROM_LINK(Record) CR(Record, ONE_OF_OPTION_MAP, Link, ONE_OF_OPTION_MAP_SIGNATURE)\r
 #define ONE_OF_OPTION_MAP_SIGNATURE            EFI_SIGNATURE_32 ('O', 'O', 'O', 'M')\r
 typedef struct {\r
-  UINT32          Signature;\r
-  LIST_ENTRY      Link;       \r
+  UINT32            Signature;\r
+  LIST_ENTRY        Link;       \r
 \r
-  UINT8           ValueType; //EFI_IFR_TYPE_NUM_* \r
+  UINT8             ValueType; //EFI_IFR_TYPE_NUM_* \r
 \r
-  EFI_QUESTION_ID     QuestionId;\r
+  EFI_QUESTION_ID   QuestionId;\r
 \r
-  LIST_ENTRY      OneOfOptionMapEntryListHead; //ONE_OF_OPTION_MAP_ENTRY\r
+  LIST_ENTRY        OneOfOptionMapEntryListHead; //ONE_OF_OPTION_MAP_ENTRY\r
 } ONE_OF_OPTION_MAP;\r
 \r
 \r
@@ -220,34 +231,19 @@ extern HII_THUNK_PRIVATE_DATA                     *mHiiThunkPrivateData;
 extern BOOLEAN                                    mInFrameworkUpdatePakcage;\r
 \r
 \r
-//\r
-// Prototypes\r
-//\r
-\r
-//\r
-// Public Interface Prototypes\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-InitializeHiiDatabase (\r
-  IN EFI_HANDLE             ImageHandle,\r
-  IN EFI_SYSTEM_TABLE       *SystemTable\r
-  )\r
-;\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 HiiNewPack (\r
-  IN  EFI_HII_PROTOCOL      *This,\r
-  IN  EFI_HII_PACKAGES      *PackageList,\r
-  OUT FRAMEWORK_EFI_HII_HANDLE         *Handle\r
+  IN  EFI_HII_PROTOCOL              *This,\r
+  IN  EFI_HII_PACKAGES              *PackageList,\r
+  OUT FRAMEWORK_EFI_HII_HANDLE      *Handle\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiRemovePack (\r
-  IN EFI_HII_PROTOCOL    *This,\r
+  IN EFI_HII_PROTOCOL               *This,\r
   IN FRAMEWORK_EFI_HII_HANDLE       Handle\r
   )\r
 ;\r
@@ -255,31 +251,31 @@ HiiRemovePack (
 EFI_STATUS\r
 EFIAPI\r
 HiiFindHandles (\r
-  IN     EFI_HII_PROTOCOL    *This,\r
-  IN OUT UINT16              *HandleBufferLength,\r
-  OUT    FRAMEWORK_EFI_HII_HANDLE       *Handle\r
+  IN     EFI_HII_PROTOCOL           *This,\r
+  IN OUT UINT16                     *HandleBufferLength,\r
+  OUT    FRAMEWORK_EFI_HII_HANDLE   *Handle\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiExportDatabase (\r
-  IN     EFI_HII_PROTOCOL *This,\r
-  IN     FRAMEWORK_EFI_HII_HANDLE    Handle,\r
-  IN OUT UINTN            *BufferSize,\r
-  OUT    VOID             *Buffer\r
+  IN     EFI_HII_PROTOCOL           *This,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
+  IN OUT UINTN                      *BufferSize,\r
+  OUT    VOID                       *Buffer\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiGetGlyph (\r
-  IN     EFI_HII_PROTOCOL    *This,\r
-  IN     CHAR16              *Source,\r
-  IN OUT UINT16              *Index,\r
-  OUT    UINT8               **GlyphBuffer,\r
-  OUT    UINT16              *BitWidth,\r
-  IN OUT UINT32              *InternalStatus\r
+  IN     EFI_HII_PROTOCOL           *This,\r
+  IN     CHAR16                     *Source,\r
+  IN OUT UINT16                     *Index,\r
+  OUT    UINT8                      **GlyphBuffer,\r
+  OUT    UINT16                     *BitWidth,\r
+  IN OUT UINT32                     *InternalStatus\r
   )\r
 ;\r
 \r
@@ -311,117 +307,108 @@ HiiNewString (
 EFI_STATUS\r
 EFIAPI\r
 HiiGetString (\r
-  IN     EFI_HII_PROTOCOL    *This,\r
-  IN     FRAMEWORK_EFI_HII_HANDLE       Handle,\r
-  IN     STRING_REF          Token,\r
-  IN     BOOLEAN             Raw,\r
-  IN     CHAR16              *LanguageString,\r
-  IN OUT UINTN               *BufferLength,\r
-  OUT    EFI_STRING          StringBuffer\r
+  IN     EFI_HII_PROTOCOL           *This,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
+  IN     STRING_REF                 Token,\r
+  IN     BOOLEAN                    Raw,\r
+  IN     CHAR16                     *LanguageString,\r
+  IN OUT UINTN                      *BufferLength,\r
+  OUT    EFI_STRING                 StringBuffer\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiResetStrings (\r
-  IN     EFI_HII_PROTOCOL    *This,\r
-  IN     FRAMEWORK_EFI_HII_HANDLE       Handle\r
+  IN     EFI_HII_PROTOCOL           *This,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE   Handle\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiTestString (\r
-  IN     EFI_HII_PROTOCOL    *This,\r
-  IN     CHAR16              *StringToTest,\r
-  IN OUT UINT32              *FirstMissing,\r
-  OUT    UINT32              *GlyphBufferSize\r
+  IN     EFI_HII_PROTOCOL           *This,\r
+  IN     CHAR16                     *StringToTest,\r
+  IN OUT UINT32                     *FirstMissing,\r
+  OUT    UINT32                     *GlyphBufferSize\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiGetPrimaryLanguages (\r
-  IN  EFI_HII_PROTOCOL      *This,\r
-  IN  FRAMEWORK_EFI_HII_HANDLE         Handle,\r
-  OUT EFI_STRING            *LanguageString\r
+  IN  EFI_HII_PROTOCOL              *This,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE      Handle,\r
+  OUT EFI_STRING                    *LanguageString\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiGetSecondaryLanguages (\r
-  IN  EFI_HII_PROTOCOL      *This,\r
-  IN  FRAMEWORK_EFI_HII_HANDLE         Handle,\r
-  IN  CHAR16                *PrimaryLanguage,\r
-  OUT EFI_STRING            *LanguageString\r
+  IN  EFI_HII_PROTOCOL                *This,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE        Handle,\r
+  IN  CHAR16                          *PrimaryLanguage,\r
+  OUT EFI_STRING                      *LanguageString\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiGetLine (\r
-  IN     EFI_HII_PROTOCOL    *This,\r
+  IN     EFI_HII_PROTOCOL               *This,\r
   IN     FRAMEWORK_EFI_HII_HANDLE       Handle,\r
-  IN     STRING_REF          Token,\r
-  IN OUT UINT16              *Index,\r
-  IN     UINT16              LineWidth,\r
-  IN     CHAR16              *LanguageString,\r
-  IN OUT UINT16              *BufferLength,\r
-  OUT    EFI_STRING          StringBuffer\r
+  IN     STRING_REF                     Token,\r
+  IN OUT UINT16                         *Index,\r
+  IN     UINT16                         LineWidth,\r
+  IN     CHAR16                         *LanguageString,\r
+  IN OUT UINT16                         *BufferLength,\r
+  OUT    EFI_STRING                     StringBuffer\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiGetForms (\r
-  IN     EFI_HII_PROTOCOL    *This,\r
+  IN     EFI_HII_PROTOCOL               *This,\r
   IN     FRAMEWORK_EFI_HII_HANDLE       Handle,\r
-  IN     EFI_FORM_ID         FormId,\r
-  IN OUT UINTN               *BufferLength,\r
-  OUT    UINT8               *Buffer\r
+  IN     EFI_FORM_ID                    FormId,\r
+  IN OUT UINTN                          *BufferLength,\r
+  OUT    UINT8                          *Buffer\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiGetDefaultImage (\r
-  IN     EFI_HII_PROTOCOL           *This,\r
-  IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
-  IN     UINTN                      DefaultMask,\r
-  OUT    EFI_HII_VARIABLE_PACK_LIST **VariablePackList\r
+  IN     EFI_HII_PROTOCOL               *This,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE       Handle,\r
+  IN     UINTN                          DefaultMask,\r
+  OUT    EFI_HII_VARIABLE_PACK_LIST     **VariablePackList\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiUpdateForm (\r
-  IN EFI_HII_PROTOCOL       *This,\r
-  IN FRAMEWORK_EFI_HII_HANDLE          Handle,\r
-  IN EFI_FORM_LABEL         Label,\r
-  IN BOOLEAN                AddData,\r
-  IN FRAMEWORK_EFI_HII_UPDATE_DATA    *Data\r
+  IN EFI_HII_PROTOCOL                   *This,\r
+  IN FRAMEWORK_EFI_HII_HANDLE           Handle,\r
+  IN EFI_FORM_LABEL                     Label,\r
+  IN BOOLEAN                            AddData,\r
+  IN FRAMEWORK_EFI_HII_UPDATE_DATA      *Data\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 HiiGetKeyboardLayout (\r
-  IN     EFI_HII_PROTOCOL    *This,\r
-  OUT    UINT16              *DescriptorCount,\r
-  OUT    FRAMEWORK_EFI_KEY_DESCRIPTOR  *Descriptor\r
+  IN     EFI_HII_PROTOCOL               *This,\r
+  OUT    UINT16                         *DescriptorCount,\r
+  OUT    FRAMEWORK_EFI_KEY_DESCRIPTOR   *Descriptor\r
   )\r
 ;\r
 \r
-EFI_STATUS\r
-HiiCompareLanguage (\r
-  IN  CHAR16                *LanguageStringLocation,\r
-  IN  CHAR16                *Language\r
-  )\r
-;\r
-\r
-\r
-\r
 EFI_STATUS\r
 EFIAPI \r
 ThunkSendForm (\r
@@ -429,12 +416,13 @@ ThunkSendForm (
   IN  BOOLEAN                         UseDatabase,\r
   IN  FRAMEWORK_EFI_HII_HANDLE        *Handle,\r
   IN  UINTN                           HandleCount,\r
-  IN  FRAMEWORK_EFI_IFR_PACKET                  *Packet, OPTIONAL\r
+  IN  FRAMEWORK_EFI_IFR_PACKET        *Packet, OPTIONAL\r
   IN  EFI_HANDLE                      CallbackHandle, OPTIONAL\r
   IN  UINT8                           *NvMapOverride, OPTIONAL\r
-  IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR            *ScreenDimensions, OPTIONAL\r
+  IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL\r
   OUT BOOLEAN                         *ResetRequired OPTIONAL\r
-  );\r
+  )\r
+;\r
 \r
 EFI_STATUS\r
 EFIAPI \r
@@ -446,7 +434,8 @@ ThunkCreatePopUp (
   OUT EFI_INPUT_KEY                   *KeyValue,\r
   IN  CHAR16                          *String,\r
   ...\r
-  );\r
+  )\r
+;\r
 \r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
index 78eae0f1e06f09cdc0428e9b7d13eed003b54efd..522b05c6751e13ad8e2d9432d0ade96634775a77 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
@@ -1,5 +1,5 @@
 /**@file\r
-  Framework HII handle database allocation and deallocation functins.\r
+  This file is for functins related to assign and free Framework HII handle number.\r
   \r
 Copyright (c) 2008, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
index 469799622385994a6853e98316697f3f2e465fda..78612795b5c0b591c344fe240a74840828fd2c6d 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h
@@ -1,6 +1,5 @@
 /**@file\r
-\r
-  This file contains utility functions by HII Thunk Modules.\r
+  This file is for functins related to assign and free Framework HII handle number.\r
   \r
 Copyright (c) 2006 - 2008, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
index cf43572ab716a820d8d15f529e49de6aeb983626..6359c8e6802c9bb12822df03e4accb9e1513e77d 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
@@ -717,7 +717,7 @@ typedef struct {
 \r
 EFI_STATUS\r
 F2UCreateNumericOpCode (\r
-  IN       HII_THUNK_CONTEXT               *ThunkContext,\r
+  IN       HII_THUNK_CONTEXT           *ThunkContext,\r
   IN       UINT16                      VarStoreId,\r
   IN CONST FRAMEWORK_EFI_IFR_NUMERIC   *FwOpcode,\r
   OUT      EFI_HII_UPDATE_DATA         *UefiData\r
@@ -755,10 +755,7 @@ F2UCreateNumericOpCode (
   UOpcode.Question.Header.Help = FwOpcode->Help;\r
 \r
   UOpcode.Question.QuestionId    = FwOpcode->Key;\r
-  //\r
-  // BUGBUG RESERVED_VARSTORE_ID should be passed in.\r
-  //\r
-  UOpcode.Question.VarStoreId    = RESERVED_VARSTORE_ID;\r
+  UOpcode.Question.VarStoreId    = VarStoreId;\r
   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r
 \r
   UOpcode.Question.Flags  = (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
index 37d2f579315f9cca19b72d30585ed4c80782ccf8..a8676892525ab68db6391f54679d7c3d3f501ec4 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
@@ -43,7 +43,7 @@ GetPackageCount (
   \r
   for (Index = 0; Index < Packages->NumberOfPackages; Index++) {\r
     //\r
-    // BugBug: The current UEFI HII build tool generate a binary in the format defined in: \r
+    // The current UEFI HII build tool generate a binary in the format defined by \r
     // TIANO_AUTOGEN_PACKAGES_HEADER. We assume that all packages generated in\r
     // this binary is with same package type. So the returned IfrPackageCount and StringPackageCount\r
     // may not be the exact number of valid package number in the binary generated \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/SetupBrowser.c
index 750df86491168bd4c6999e253d67ae01c0d998e3..5e391127cf6cc942effac3729d047fc78ed7977b 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/SetupBrowser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/SetupBrowser.c
@@ -37,7 +37,7 @@ ThunkSendForm (
 \r
   if (!UseDatabase) {\r
     //\r
-    // Packet, CallbackHandle.\r
+    // ThunkSendForm only support displays forms registered into the HII database.\r
     //\r
     return EFI_UNSUPPORTED;\r
   }\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
index 9a380605227ad840da21feac846d31a66d04e97b..9e2df6fc62cbbb0020f5226480f02fbf4e29455c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
@@ -132,10 +132,6 @@ Returns:
   BOOLEAN                                   Found;\r
   CHAR8                                     *Rfc3066AsciiLanguage;\r
 \r
-  //\r
-  // BugBug: Conver the language to 3066.\r
-  //\r
-\r
   LastStringId      = (EFI_STRING_ID) 0;\r
   StringId          = (EFI_STRING_ID) 0;\r
   Found             = FALSE;\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
index 12dd3be0b1c2bd91a187c9dad889a6f7034d9131..23c784b0b979e2a4126363a3e4c7a4081dcc2b03 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
@@ -26,6 +26,7 @@
 \r
 #include "UefiIfrParser.h"\r
 #include "UefiIfrDefault.h"\r
+#include "HiiDatabase.h"\r
 \r
 //\r
 // Extern Variables\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
index ec061730e8d0c165c0719109065a7f447213a5a6..9bb4063b605dcd55bbfca2601215458daa70e152 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
@@ -15,16 +15,6 @@
 #ifndef _HII_THUNK_UEFI_IFR_DEFAULT_\r
 #define _HII_THUNK_UEFI_IFR_DEFAULT_\r
 \r
-//\r
-// VARSTORE ID of 0 for Buffer Storage Type Storage is reserved in UEFI IFR form. But VARSTORE ID\r
-// 0 in Framework IFR is the default VarStore ID for storage without explicit declaration. So we have\r
-// to reseved 0x0001 in UEFI VARSTORE ID to represetn default storage id in Framework IFR.\r
-// Framework VFR has to be ported or pre-processed to change the default VARSTORE to a VARSTORE\r
-// with ID equal to 0x0001.\r
-//\r
-#define RESERVED_VARSTORE_ID 0x0001\r
-#define RESERVED_QUESTION_ID 0xf000\r
-\r
 #define UEFI_IFR_BUFFER_STORAGE_NODE_FROM_LIST(a) CR(a, UEFI_IFR_BUFFER_STORAGE_NODE, List, UEFI_IFR_BUFFER_STORAGE_NODE_SIGNATURE)\r
 #define UEFI_IFR_BUFFER_STORAGE_NODE_SIGNATURE  EFI_SIGNATURE_32 ('I', 'b', 'S', 'n')\r
 typedef struct {\r