sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean console control protocol in bds module.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7915 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff
2009-03-20 09:25:28 +00:00
parent 9efcf13fcc
commit 5d7c160908
7 changed files with 22 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
View File

@@ -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>

1
IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
View File

@@ -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

7
IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
View File

@@ -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);
}
}

28
IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
View File

@@ -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,