UEFI HII: Merge UEFI HII support changes from branch.

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

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
index 51570f20b9fdffc5f00bffcd69e127f637ed0337..1d7420f40ebce8c0fe0430f2a2fdf1429b1cef2e 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
@@ -45,7 +45,7 @@ FreeAllMenu (
 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
@@ -101,7 +101,7 @@ EFIAPI
 DriverCallback (\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
@@ -742,7 +742,7 @@ Returns:
   EFI_HII_PACKAGES          *PackageList;\r
   BMM_CALLBACK_DATA         *BmmCallbackInfo;\r
   EFI_HII_PROTOCOL          *Hii;\r
-  EFI_HII_HANDLE            HiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE            HiiHandle;\r
   EFI_STATUS                Status;\r
   EFI_HANDLE                Handle;\r
   UINT8                     *Ptr;\r
@@ -905,51 +905,51 @@ Returns:
       FORM_SET_FD_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_FD_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_FD_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_FD_ORDER_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_SET_HD_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_HD_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_HD_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_HD_ORDER_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_SET_CD_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_CD_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_CD_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_CD_ORDER_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_SET_NET_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_NET_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_NET_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_NET_ORDER_ID,\r
       Location\r
       );\r
 \r
-    Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length;\r
+    Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length;\r
 \r
     CreateGotoOpCode (\r
       FORM_SET_BEV_ORDER_ID,\r
       STRING_TOKEN (STR_FORM_SET_BEV_ORDER_TITLE),\r
       STRING_TOKEN (STR_FORM_SET_BEV_ORDER_TITLE),\r
-      EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS,\r
+      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS,\r
       FORM_SET_BEV_ORDER_ID,\r
       Location\r
       );\r
@@ -1313,5 +1313,5 @@ CreateCallbackPacket (
 \r
   (*Packet)->DataArray.EntryCount   = 1;\r
   (*Packet)->DataArray.NvRamMap     = NULL;\r
-  ((EFI_IFR_DATA_ENTRY *) (&((*Packet)->DataArray) + 1))->Flags  = Flags;\r
+  ((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (&((*Packet)->DataArray) + 1))->Flags  = Flags;\r
 }\r