From 5d7c160908a740e50811fde210e444a5f32518f9 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Fri, 20 Mar 2009 09:25:28 +0000 Subject: 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 --- IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h | 1 - .../Universal/BdsDxe/BdsDxe.inf | 1 - .../Universal/BdsDxe/FrontPage.c | 7 +----- .../Universal/BdsDxe/MemoryTest.c | 28 ++++++++-------------- 4 files changed, 11 insertions(+), 26 deletions(-) (limited to 'IntelFrameworkModulePkg/Universal') 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 #include #include -#include #include #include #include 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.
+Copyright (c) 2004 - 2009, Intel Corporation.
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.
+Copyright (c) 2004 - 2009, Intel Corporation.
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, -- cgit v1.2.3