UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / Nt32Pkg / PlatformBdsDxe / Generic / BootMaint / BootMaint.h

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
index c366a6657792fc1b6f27088d7c49c3ce93362178..d26d7f7f9471fdec379ee4cba925e4393ac17088 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
@@ -523,7 +523,7 @@ typedef struct {
   //\r
   // BMM main formset callback data.\r
   //\r
-  EFI_HII_HANDLE                BmmHiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE      BmmHiiHandle;\r
   EFI_HANDLE                    BmmCallbackHandle;\r
   EFI_FORM_CALLBACK_PROTOCOL    BmmDriverCallback;\r
   FORM_ID                       BmmCurrentPageId;\r
@@ -535,7 +535,7 @@ typedef struct {
   //\r
   // File explorer formset callback data.\r
   //\r
-  EFI_HII_HANDLE                FeHiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE      FeHiiHandle;\r
   EFI_HANDLE                    FeCallbackHandle;\r
   EFI_FORM_CALLBACK_PROTOCOL    FeDriverCallback;\r
   FILE_EXPLORER_STATE           FeCurrentState;\r
@@ -758,7 +758,7 @@ Var_ChangeBootOrder ();
 EFI_STATUS\r
 Var_UpdateDriverOption (\r
   IN  BMM_CALLBACK_DATA         *CallbackData,\r
-  IN  EFI_HII_HANDLE            HiiHandle,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE  HiiHandle,\r
   IN  UINT16                    *DescriptionData,\r
   IN  UINT16                    *OptionalData,\r
   IN  UINT8                     ForceReconnect\r
@@ -1017,7 +1017,7 @@ EfiDevicePathInstanceCount (
 EFI_STATUS\r
 CreateMenuStringToken (\r
   IN BMM_CALLBACK_DATA                *CallbackData,\r
-  IN EFI_HII_HANDLE                   HiiHandle,\r
+  IN FRAMEWORK_EFI_HII_HANDLE         HiiHandle,\r
   IN BM_MENU_OPTION                   *MenuOption\r
   );\r
 \r
@@ -1097,7 +1097,7 @@ EFIAPI
 FileExplorerCallback (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *Data,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *Data,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   );\r
 \r