From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 20 Mar 2009 09:25:28 +0000 (+0000)
Subject: clean console control protocol in bds module.
X-Git-Tag: edk2-stable201903~18341
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=5d7c160908a740e50811fde210e444a5f32518f9

clean console control protocol in bds module.

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

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
index 1e34c03e20..30a6c3e6ed 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
@@ -1,7 +1,7 @@
 /** @file
   BDS Lib functions which contain all the code to connect console device
 
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+Copyright (c) 2004 - 2009, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -728,16 +728,7 @@ LockKeyboards (
   IN  CHAR16    *Password
   )
 {
-  EFI_STATUS                    Status;
-  EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;
-
-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);
-  if (EFI_ERROR (Status)) {
     return EFI_UNSUPPORTED;
-  }
-
-  Status = ConsoleControl->LockStdIn (ConsoleControl, Password);
-  return Status;
 }
 
 
@@ -758,7 +749,6 @@ EnableQuietBoot (
   )
 {
   EFI_STATUS                    Status;
-  EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;
   EFI_OEM_BADGING_PROTOCOL      *Badging;
   UINT32                        SizeOfX;
   UINT32                        SizeOfY;
@@ -780,11 +770,6 @@ EnableQuietBoot (
   UINT32                        RefreshRate;
   EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;
 
-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);
-  if (EFI_ERROR (Status)) {
-    return EFI_UNSUPPORTED;
-  }
-
   UgaDraw = NULL;
   //
   // Try to open GOP first
@@ -801,16 +786,13 @@ EnableQuietBoot (
     return EFI_UNSUPPORTED;
   }
 
-  Badging = NULL;
-  Status  = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, (VOID **) &Badging);
-
   //
-  // Set console control to graphics mode.
+  // Erase Cursor from screen
   //
-  Status = ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenGraphics);
-  if (EFI_ERROR (Status)) {
-    return EFI_UNSUPPORTED;
-  }
+  gST->ConOut->EnableCursor (gST->ConOut, FALSE);
+
+  Badging = NULL;
+  Status  = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, (VOID **) &Badging);
 
   if (GraphicsOutput != NULL) {
     SizeOfX = GraphicsOutput->Mode->Info->HorizontalResolution;
@@ -1004,17 +986,11 @@ DisableQuietBoot (
   VOID
   )
 {
-  EFI_STATUS                    Status;
-  EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;
-
-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);
-  if (EFI_ERROR (Status)) {
-    return EFI_UNSUPPORTED;
-  }
 
   //
-  // Set console control to text mode.
+  // Enable Cursor on Screen
   //
-  return ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);
+  gST->ConOut->EnableCursor (gST->ConOut, TRUE);
+  return EFI_SUCCESS;
 }
 
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index 983280a666..52467067cd 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -5,7 +5,7 @@
 #  2) BDS boot device connect interface;
 #  3) BDS Misc interfaces for mainting boot variable, ouput string, etc.
 #  
-#  Copyright (c) 2007 - 2008, Intel Corporation. <BR>
+#  Copyright (c) 2007 - 2009, Intel Corporation. <BR>
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -105,7 +105,6 @@
   gEfiAcpiS3SaveProtocolGuid                    # PROTOCOL CONSUMES
   gEfiGraphicsOutputProtocolGuid                # PROTOCOL SOMETIMES_CONSUMES
   gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport # PROTOCOL SOMETIMES_CONSUMES
-  gEfiConsoleControlProtocolGuid                # PROTOCOL CONSUMES
   gEfiOEMBadgingProtocolGuid                    # PROTOCOL CONSUMES
   gEfiHiiFontProtocolGuid                       # PROTOCOL CONSUMES
   gEfiSecurityArchProtocolGuid
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index 61d5227c09..3b2fe85954 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -1,7 +1,7 @@
 /** @file
   BDS library definition, include the file and data structure
 
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+Copyright (c) 2004 - 2009, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -34,7 +34,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/PciIo.h>
 #include <Protocol/AcpiS3Save.h>
 #include <Protocol/OEMBadging.h>
-#include <Protocol/ConsoleControl.h>
 #include <Protocol/GraphicsOutput.h>
 #include <Protocol/UgaDraw.h>
 #include <Protocol/HiiFont.h>
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
index 2471c12be7..50e5689cce 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
@@ -31,7 +31,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/BlockIo.h>
 #include <Guid/GlobalVariable.h>
 #include <Guid/CapsuleVendor.h>
-#include <Protocol/ConsoleControl.h>
 #include <Protocol/GenericMemoryTest.h>
 #include <Protocol/FormBrowser2.h>
 #include <Protocol/HiiConfigAccess.h>
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
index 19294ae9d3..2daacb6d6f 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -145,7 +145,6 @@
   gEfiDataHubProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES
   gEfiGenericMemTestProtocolGuid                # PROTOCOL ALWAYS_CONSUMES
   gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMES
-  gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMES
   gEfiHiiDatabaseProtocolGuid                   # PROTOCOL ALWAYS_CONSUMES
   gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport # PROTOCOL SOMETIMES_CONSUMES
   gEfiBlockIoProtocolGuid                       # PROTOCOL ALWAYS_CONSUMES
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index c1b4eff1cd..fb605d57d9 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -1,7 +1,7 @@
 /** @file
   FrontPage routines to handle the callbacks and browser calls
 
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+Copyright (c) 2004 - 2009, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -856,7 +856,6 @@ PlatformBdsEnterFrontPage (
   )
 {
   EFI_STATUS                    Status;
-  EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;
 
   PERF_START (0, "BdsTimeOut", "BDS", 0);
   //
@@ -970,8 +969,4 @@ Exit:
   // takes affect
   //
   PERF_END (0, "BdsTimeOut", "BDS", 0);
-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);
-  if (Status == EFI_SUCCESS) {
-    ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);
-  }
 }
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
index 854f8952c4..59759509e2 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
@@ -1,7 +1,7 @@
 /** @file
   Perform the platform memory test
 
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+Copyright (c) 2004 - 2009, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -222,7 +222,7 @@ BdsMemoryTest (
   BOOLEAN                           ErrorOut;
   BOOLEAN                           TestAbort;
   EFI_INPUT_KEY                     Key;
-  CHAR16                            StrPercent[16];
+  CHAR16                            StrPercent[80];
   CHAR16                            *StrTotalMemory;
   CHAR16                            *Pos;
   CHAR16                            *TmpStr;
@@ -255,10 +255,6 @@ BdsMemoryTest (
 
   RequireSoftECCInit = FALSE;
 
-  gST->ConOut->ClearScreen (gST->ConOut);
-  gST->ConOut->SetAttribute (gST->ConOut, EFI_YELLOW | EFI_BRIGHT);
-  gST->ConOut->EnableCursor (gST->ConOut, FALSE);
-
   Status = gBS->LocateProtocol (
                   &gEfiGenericMemTestProtocolGuid,
                   NULL,
@@ -286,11 +282,10 @@ BdsMemoryTest (
     return EFI_SUCCESS;
   }
 
-  gST->ConOut->SetCursorPosition (gST->ConOut, 0, 2);
   TmpStr = GetStringById (STRING_TOKEN (STR_ESC_TO_SKIP_MEM_TEST));
 
   if (TmpStr != NULL) {
-    gST->ConOut->OutputString (gST->ConOut, TmpStr);
+    PrintXY (10, 10, NULL, NULL, TmpStr);
     FreePool (TmpStr);
   }
 
@@ -306,8 +301,6 @@ BdsMemoryTest (
       TmpStr = GetStringById (STRING_TOKEN (STR_SYSTEM_MEM_ERROR));
       if (TmpStr != NULL) {
         PrintXY (10, 10, NULL, NULL, TmpStr);
-        gST->ConOut->SetCursorPosition (gST->ConOut, 0, 4);
-        gST->ConOut->OutputString (gST->ConOut, TmpStr);
         FreePool (TmpStr);
       }
 
@@ -321,10 +314,13 @@ BdsMemoryTest (
                             );
     if (TestPercent != PreviousValue) {
       UnicodeValueToString (StrPercent, 0, TestPercent, 0);
-      gST->ConOut->SetCursorPosition (gST->ConOut, 0, 0);
       TmpStr = GetStringById (STRING_TOKEN (STR_MEMORY_TEST_PERCENT));
       if (TmpStr != NULL) {
-        BdsLibOutputStrings (gST->ConOut, StrPercent, TmpStr, NULL);
+        //
+        // TmpStr size is 64, StrPercent is reserved to 16.
+        //
+        StrCat (StrPercent, TmpStr);
+        PrintXY (10, 10, NULL, NULL, StrPercent);
         FreePool (TmpStr);
       }
 
@@ -360,8 +356,7 @@ BdsMemoryTest (
           FreePool (TmpStr);
         }
 
-        gST->ConOut->SetCursorPosition (gST->ConOut, 0, 0);
-        gST->ConOut->OutputString (gST->ConOut, L"100");
+        PrintXY (10, 10, NULL, NULL, L"100");
         Status = GenMemoryTest->Finished (GenMemoryTest);
         goto Done;
       }
@@ -384,10 +379,7 @@ Done:
     FreePool (TmpStr);
   }
 
-  gST->ConOut->ClearScreen (gST->ConOut);
-  gST->ConOut->SetAttribute (gST->ConOut, EFI_YELLOW | EFI_BRIGHT);
-  gST->ConOut->EnableCursor (gST->ConOut, FALSE);
-  gST->ConOut->OutputString (gST->ConOut, StrTotalMemory);
+  PrintXY (10, 10, NULL, NULL, StrTotalMemory);
   PlatformBdsShowProgress (
     Foreground,
     Background,