Code scrub for Universal\Console\GraphicsConsoleDxe.

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiToUefiHiiThunk / UefiIfrDefault.h

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
index ec061730e8d0c165c0719109065a7f447213a5a6..e06b2829c3a923042f442598059eb8ea5fa175ee 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h
@@ -15,18 +15,8 @@
 #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
+#define UEFI_IFR_BUFFER_STORAGE_NODE_SIGNATURE  SIGNATURE_32 ('I', 'b', 'S', 'n')\r
 typedef struct {\r
   LIST_ENTRY   List;\r
   UINT32       Signature;\r
@@ -55,8 +45,8 @@ typedef struct {
 **/\r
 EFI_STATUS\r
 UefiIfrGetBufferTypeDefaults (\r
-  EFI_HII_HANDLE      UefiHiiHandle,\r
-  LIST_ENTRY          **UefiDefaults\r
+  IN  HII_THUNK_CONTEXT   *ThunkContext,\r
+  OUT LIST_ENTRY          **UefiDefaults\r
 );\r
 \r
 /**\r
@@ -83,9 +73,9 @@ EFI_STATUS
 UefiDefaultsToFwDefaults (\r
   IN     LIST_ENTRY                  *UefiIfrDefaults,\r
   IN     UINTN                       DefaultMask,\r
+  IN     EFI_VARSTORE_ID             UefiFormSetDefaultVarStoreId,\r
   OUT    EFI_HII_VARIABLE_PACK_LIST  **VariablePackList\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Free up all buffer allocated for the link list of UEFI_IFR_BUFFER_STORAGE_NODE.\r
@@ -102,8 +92,7 @@ UefiDefaultsToFwDefaults (
 VOID\r
 FreeDefaultList (\r
   IN     LIST_ENTRY                  *UefiIfrDefaults\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r
 \r