Skip locating Terminal driver Protocol Guid to determine the terminal options. It...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4761 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index 06a879a3efb047b42f6b16bd950250bb170abe4c..01b547ec45c464808a450118b13184de1f5ae636 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -21,10 +21,6 @@ Abstract:
 \r
 #include "BootMaint.h"\r
 \r
-EFI_GUID gTerminalDriverGuid = {\r
-  0x10634d8e, 0x1c05, 0x46cb, {0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8}\r
-};\r
-\r
 VOID\r
 RefreshUpdateData (\r
   VOID\r
@@ -179,27 +175,23 @@ UpdateConCOMPage (
 {\r
   BM_MENU_ENTRY *NewMenuEntry;\r
   UINT16        Index;\r
-  EFI_STATUS    Status;\r
-  VOID          *Interface;\r
 \r
   CallbackData->BmmAskSaveOrNot = FALSE;\r
 \r
   UpdatePageStart (CallbackData);\r
 \r
-  Status = EfiLibLocateProtocol (&gTerminalDriverGuid, (VOID **) &Interface);\r
-  if (!EFI_ERROR (Status)) {\r
-    for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
-      NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
 \r
-      CreateGotoOpCode (\r
-        FORM_CON_COM_SETUP_ID,\r
-        NewMenuEntry->DisplayStringToken,\r
-        STRING_TOKEN (STR_NULL_STRING),\r
-        EFI_IFR_FLAG_CALLBACK,\r
-        (UINT16) (TERMINAL_OPTION_OFFSET + Index),\r
-        &gUpdateData\r
-        );\r
-    }\r
+  for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
+    NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
+\r
+    CreateGotoOpCode (\r
+      FORM_CON_COM_SETUP_ID,\r
+      NewMenuEntry->DisplayStringToken,\r
+      STRING_TOKEN (STR_NULL_STRING),\r
+      EFI_IFR_FLAG_CALLBACK,\r
+      (UINT16) (TERMINAL_OPTION_OFFSET + Index),\r
+      &gUpdateData\r
+      );\r
   }\r
 \r
   UpdatePageEnd (CallbackData);\r
@@ -384,9 +376,7 @@ UpdateConsolePage (
   UINT16              Index;\r
   UINT16              Index2;\r
   UINT8               CheckFlags;\r
-  EFI_STATUS          Status;\r
-  VOID                *Interface;\r
-\r
+ \r
   CallbackData->BmmAskSaveOrNot = TRUE;\r
 \r
   UpdatePageStart (CallbackData);\r
@@ -414,36 +404,33 @@ UpdateConsolePage (
       );\r
   }\r
 \r
-  Status = EfiLibLocateProtocol (&gTerminalDriverGuid, (VOID **) &Interface);\r
-  if (!EFI_ERROR (Status)) {\r
-    for (Index2 = 0; Index2 < TerminalMenu.MenuNumber; Index2++) {\r
-      CheckFlags          = 0;\r
-      NewMenuEntry        = BOpt_GetMenuEntry (&TerminalMenu, Index2);\r
-      NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
-\r
-      if ((NewTerminalContext->IsConIn && (UpdatePageId == FORM_CON_IN_ID)) ||\r
-          (NewTerminalContext->IsConOut && (UpdatePageId == FORM_CON_OUT_ID)) ||\r
-          (NewTerminalContext->IsStdErr && (UpdatePageId == FORM_CON_ERR_ID))\r
-          ) {\r
-        CheckFlags |= EFI_IFR_CHECKBOX_DEFAULT;\r
-        CallbackData->BmmFakeNvData.ConsoleCheck[Index] = TRUE;\r
-      } else {\r
-        CallbackData->BmmFakeNvData.ConsoleCheck[Index] = FALSE;\r
-      }\r
-\r
-      CreateCheckBoxOpCode (\r
-        (EFI_QUESTION_ID) (CON_DEVICE_QUESTION_ID + Index),\r
-        VARSTORE_ID_BOOT_MAINT,\r
-        (UINT16) (CON_DEVICE_VAR_OFFSET + Index),\r
-        NewMenuEntry->DisplayStringToken,\r
-        NewMenuEntry->HelpStringToken,\r
-        0,\r
-        CheckFlags,\r
-        &gUpdateData\r
-        );\r
+  for (Index2 = 0; Index2 < TerminalMenu.MenuNumber; Index2++) {\r
+    CheckFlags          = 0;\r
+    NewMenuEntry        = BOpt_GetMenuEntry (&TerminalMenu, Index2);\r
+    NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
 \r
-      Index++;\r
+    if ((NewTerminalContext->IsConIn && (UpdatePageId == FORM_CON_IN_ID)) ||\r
+        (NewTerminalContext->IsConOut && (UpdatePageId == FORM_CON_OUT_ID)) ||\r
+        (NewTerminalContext->IsStdErr && (UpdatePageId == FORM_CON_ERR_ID))\r
+        ) {\r
+      CheckFlags |= EFI_IFR_CHECKBOX_DEFAULT;\r
+      CallbackData->BmmFakeNvData.ConsoleCheck[Index] = TRUE;\r
+    } else {\r
+      CallbackData->BmmFakeNvData.ConsoleCheck[Index] = FALSE;\r
     }\r
+\r
+    CreateCheckBoxOpCode (\r
+      (EFI_QUESTION_ID) (CON_DEVICE_QUESTION_ID + Index),\r
+      VARSTORE_ID_BOOT_MAINT,\r
+      (UINT16) (CON_DEVICE_VAR_OFFSET + Index),\r
+      NewMenuEntry->DisplayStringToken,\r
+      NewMenuEntry->HelpStringToken,\r
+      0,\r
+      CheckFlags,\r
+      &gUpdateData\r
+      );\r
+\r
+    Index++;\r
   }\r
 \r
   UpdatePageEnd (CallbackData);\r