UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / Nt32Pkg / PlatformBdsDxe / Generic / BootMngr / BootManager.c

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
index 14209b87d54fc62f52e8a85f29ca6dffc9944169..d48db10944b5142d86618a56ed124afde53eaceb 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
@@ -24,7 +24,7 @@ Abstract:
 UINT16                            mKeyInput;\r
 LIST_ENTRY                        *mBootOptionsList;\r
 BDS_COMMON_OPTION                 *gOption;\r
-EFI_HII_HANDLE                    gBootManagerHandle;\r
+FRAMEWORK_EFI_HII_HANDLE          gBootManagerHandle;\r
 EFI_HANDLE                        BootManagerCallbackHandle;\r
 EFI_FORM_CALLBACK_PROTOCOL        BootManagerCallback;\r
 EFI_GUID                          gBmGuid = BOOT_MANAGER_GUID;\r
@@ -38,7 +38,7 @@ EFIAPI
 BootManagerCallbackRoutine (\r
   IN EFI_FORM_CALLBACK_PROTOCOL       *This,\r
   IN UINT16                           KeyValue,\r
-  IN EFI_IFR_DATA_ARRAY               *DataArray,\r
+  IN FRAMEWORK_EFI_IFR_DATA_ARRAY               *DataArray,\r
   OUT EFI_HII_CALLBACK_PACKET         **Packet\r
   )\r
 /*++\r
@@ -97,7 +97,7 @@ Returns:
 \r
       DataPacket->DataArray.EntryCount  = 1;\r
       DataPacket->DataArray.NvRamMap    = NULL;\r
-      ((EFI_IFR_DATA_ENTRY *) (((EFI_IFR_DATA_ARRAY *)DataPacket) + 1))->Flags = EXIT_REQUIRED | NV_NOT_CHANGED;\r
+      ((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (((FRAMEWORK_EFI_IFR_DATA_ARRAY *)DataPacket) + 1))->Flags = EXIT_REQUIRED | NV_NOT_CHANGED;\r
       return EFI_SUCCESS;\r
     } else {\r
       continue;\r
@@ -265,13 +265,13 @@ Returns:
               0x1000, // Form ID\r
               Token,  // Token Value for the string\r
               0,      // Help String (none)\r
-              EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,  // The Op-Code flags\r
+              FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,  // The Op-Code flags\r
               mKeyInput,                                          // The Key to get a callback on\r
               Location  // Buffer containing created op-code\r
               );\r
 \r
     UpdateData->DataCount++;\r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
   }\r
 \r