Support RouteConfig function for BdsDxe driver.

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index 529fdaea2a722ad9454e8b26450126a0af9ebd25..63eeb54ccf886bacc2ebf4e0e709ee44ea178634 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -752,16 +752,16 @@ Var_UpdateBootOption (
   Index = BOpt_GetBootOptionNumber () ;\r
   UnicodeSPrint (BootString, sizeof (BootString), L"Boot%04x", Index);\r
 \r
-  if (NvRamMap->DescriptionData[0] == 0x0000) {\r
-    StrCpy (NvRamMap->DescriptionData, BootString);\r
+  if (NvRamMap->BootDescriptionData[0] == 0x0000) {\r
+    StrCpy (NvRamMap->BootDescriptionData, BootString);\r
   }\r
 \r
-  BufferSize = sizeof (UINT32) + sizeof (UINT16) + StrSize (NvRamMap->DescriptionData);\r
+  BufferSize = sizeof (UINT32) + sizeof (UINT16) + StrSize (NvRamMap->BootDescriptionData);\r
   BufferSize += GetDevicePathSize (CallbackData->LoadContext->FilePathList);\r
 \r
-  if (NvRamMap->OptionalData[0] != 0x0000) {\r
+  if (NvRamMap->BootOptionalData[0] != 0x0000) {\r
     OptionalDataExist = TRUE;\r
-    BufferSize += StrSize (NvRamMap->OptionalData);\r
+    BufferSize += StrSize (NvRamMap->BootOptionalData);\r
   }\r
 \r
   Buffer = AllocateZeroPool (BufferSize);\r
@@ -791,21 +791,21 @@ Var_UpdateBootOption (
 \r
   CopyMem (\r
     Ptr,\r
-    NvRamMap->DescriptionData,\r
-    StrSize (NvRamMap->DescriptionData)\r
+    NvRamMap->BootDescriptionData,\r
+    StrSize (NvRamMap->BootDescriptionData)\r
     );\r
 \r
-  NewLoadContext->Description = AllocateZeroPool (StrSize (NvRamMap->DescriptionData));\r
+  NewLoadContext->Description = AllocateZeroPool (StrSize (NvRamMap->BootDescriptionData));\r
   ASSERT (NewLoadContext->Description != NULL);\r
 \r
   NewMenuEntry->DisplayString = NewLoadContext->Description;\r
   CopyMem (\r
     NewLoadContext->Description,\r
     (VOID *) Ptr,\r
-    StrSize (NvRamMap->DescriptionData)\r
+    StrSize (NvRamMap->BootDescriptionData)\r
     );\r
 \r
-  Ptr += StrSize (NvRamMap->DescriptionData);\r
+  Ptr += StrSize (NvRamMap->BootDescriptionData);\r
   CopyMem (\r
     Ptr,\r
     CallbackData->LoadContext->FilePathList,\r
@@ -838,7 +838,7 @@ Var_UpdateBootOption (
   if (OptionalDataExist) {\r
     Ptr += (UINT8) GetDevicePathSize (CallbackData->LoadContext->FilePathList);\r
 \r
-    CopyMem (Ptr, NvRamMap->OptionalData, StrSize (NvRamMap->OptionalData));\r
+    CopyMem (Ptr, NvRamMap->BootOptionalData, StrSize (NvRamMap->BootOptionalData));\r
   }\r
 \r
   Status = gRT->SetVariable (\r
@@ -879,8 +879,8 @@ Var_UpdateBootOption (
       InsertTailList (&BootOptionMenu.Head, &NewMenuEntry->Link);\r
       BootOptionMenu.MenuNumber++;\r
 \r
-      NvRamMap->DescriptionData[0]  = 0x0000;\r
-      NvRamMap->OptionalData[0]     = 0x0000;\r
+      NvRamMap->BootDescriptionData[0]  = 0x0000;\r
+      NvRamMap->BootOptionalData[0]     = 0x0000;\r
     }\r
   }\r
   return EFI_SUCCESS;\r
@@ -983,11 +983,11 @@ Var_UpdateBootOrder (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  ASSERT (BootOptionMenu.MenuNumber <= (sizeof (CallbackData->BmmFakeNvData.OptionOrder) / sizeof (CallbackData->BmmFakeNvData.OptionOrder[0])));\r
+  ASSERT (BootOptionMenu.MenuNumber <= (sizeof (CallbackData->BmmFakeNvData.BootOptionOrder) / sizeof (CallbackData->BmmFakeNvData.BootOptionOrder[0])));\r
 \r
-  for (OrderIndex = 0; (OrderIndex < BootOptionMenu.MenuNumber) && (CallbackData->BmmFakeNvData.OptionOrder[OrderIndex] != 0); OrderIndex++) {\r
+  for (OrderIndex = 0; (OrderIndex < BootOptionMenu.MenuNumber) && (CallbackData->BmmFakeNvData.BootOptionOrder[OrderIndex] != 0); OrderIndex++) {\r
     for (Index = OrderIndex; Index < BootOrderListSize / sizeof (UINT16); Index++) {\r
-      if ((BootOrderList[Index] == (UINT16) (CallbackData->BmmFakeNvData.OptionOrder[OrderIndex] - 1)) && (OrderIndex != Index)) {\r
+      if ((BootOrderList[Index] == (UINT16) (CallbackData->BmmFakeNvData.BootOptionOrder[OrderIndex] - 1)) && (OrderIndex != Index)) {\r
         OptionNumber = BootOrderList[Index];\r
         CopyMem (&BootOrderList[OrderIndex + 1], &BootOrderList[OrderIndex], (Index - OrderIndex) * sizeof (UINT16));\r
         BootOrderList[OrderIndex] = OptionNumber;\r
@@ -1065,9 +1065,9 @@ Var_UpdateDriverOrder (
     FreePool (DriverOrderList);\r
   }\r
 \r
-  ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CallbackData->BmmFakeNvData.OptionOrder) / sizeof (CallbackData->BmmFakeNvData.OptionOrder[0])));\r
+  ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CallbackData->BmmFakeNvData.DriverOptionOrder) / sizeof (CallbackData->BmmFakeNvData.DriverOptionOrder[0])));\r
   for (Index = 0; Index < DriverOptionMenu.MenuNumber; Index++) {\r
-    NewDriverOrderList[Index] = (UINT16) (CallbackData->BmmFakeNvData.OptionOrder[Index] - 1);\r
+    NewDriverOrderList[Index] = (UINT16) (CallbackData->BmmFakeNvData.DriverOptionOrder[Index] - 1);\r
   }\r
 \r
   Status = gRT->SetVariable (\r
@@ -1100,7 +1100,8 @@ Var_UpdateDriverOrder (
 **/\r
 EFI_STATUS\r
 Var_UpdateBBSOption (\r
-  IN BMM_CALLBACK_DATA            *CallbackData\r
+  IN BMM_CALLBACK_DATA            *CallbackData,\r
+  IN EFI_FORM_ID                  FormId\r
   )\r
 {\r
   UINTN                       Index;\r
@@ -1129,7 +1130,7 @@ Var_UpdateBBSOption (
   DisMap              = NULL;\r
   NewOrder            = NULL;\r
 \r
-  switch (CallbackData->BmmPreviousPageId) {\r
+  switch (FormId) {\r
     case FORM_SET_FD_ORDER_ID:\r
       OptionMenu            = (BM_MENU_OPTION *) &LegacyFDMenu;\r
       LegacyDev             = CallbackData->BmmFakeNvData.LegacyFD;\r