Update for IntelFrameworkModulePkg.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMaint / UpdatePage.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index ece88524cbd0729f4d1a675ff8d8e3cd62d7ef49..7d4f33d409601bae44f9041cafdf3552bfb8f2c0 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -99,31 +99,31 @@ UpdatePageEnd (
       0\r
       );\r
 \r
-    HiiCreateGotoOpCode (\r
+    HiiCreateActionOpCode (\r
       mStartOpCodeHandle,\r
-      FORM_MAIN_ID,\r
+      KEY_VALUE_SAVE_AND_EXIT,\r
       STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       STRING_TOKEN (STR_NULL_STRING),\r
       EFI_IFR_FLAG_CALLBACK,\r
-      KEY_VALUE_SAVE_AND_EXIT\r
+      0\r
       );\r
   }\r
 \r
   //\r
   // Ensure user can return to the main page.\r
   //\r
-  HiiCreateGotoOpCode (\r
+  HiiCreateActionOpCode (\r
     mStartOpCodeHandle,\r
-    FORM_MAIN_ID,\r
+    KEY_VALUE_NO_SAVE_AND_EXIT,\r
     STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
     STRING_TOKEN (STR_NULL_STRING),\r
     EFI_IFR_FLAG_CALLBACK,\r
-    KEY_VALUE_NO_SAVE_AND_EXIT\r
+    0\r
     );\r
 \r
   HiiUpdateForm (\r
     CallbackData->BmmHiiHandle,\r
-    &mBootMaintGuid,\r
+    &gBootMaintFormSetGuid,\r
     CallbackData->BmmCurrentPageId,\r
     mStartOpCodeHandle, // Label CallbackData->BmmCurrentPageId\r
     mEndOpCodeHandle    // LABEL_END\r
@@ -151,7 +151,7 @@ CleanUpPage (
   mStartLabel->Number = LabelId;\r
   HiiUpdateForm (\r
     CallbackData->BmmHiiHandle,\r
-    &mBootMaintGuid,\r
+    &gBootMaintFormSetGuid,\r
     LabelId,\r
     mStartOpCodeHandle, // Label LabelId\r
     mEndOpCodeHandle    // LABEL_END\r
@@ -1251,7 +1251,7 @@ UpdateSetLegacyDeviceOrderPage (
   IN BMM_CALLBACK_DATA                *CallbackData\r
   )\r
 {\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
   BM_MENU_OPTION              *OptionMenu;\r
   BM_MENU_ENTRY               *NewMenuEntry;\r
   EFI_STRING_ID               StrRef;\r
@@ -1382,12 +1382,12 @@ UpdateSetLegacyDeviceOrderPage (
   //\r
   VarData = BdsLibGetVariableAndSize (\r
               VAR_LEGACY_DEV_ORDER,\r
-              &EfiLegacyDevOrderGuid,\r
+              &gEfiLegacyDevOrderVariableGuid,\r
               &VarSize\r
               );\r
 \r
   if (NULL != VarData) {\r
-    DevOrder    = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+    DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
     while (VarData < VarData + VarSize) {\r
       if (DevOrder->BbsType == BbsType) {\r
         break;\r
@@ -1395,7 +1395,7 @@ UpdateSetLegacyDeviceOrderPage (
 \r
       VarData += sizeof (BBS_TYPE);\r
       VarData += *(UINT16 *) VarData;\r
-      DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+      DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
     }\r
     //\r
     // Create oneof tag here for FD/HD/CD #1 #2\r