From 519f076a478a7da9ff4b9d5327a993b1fc2968e8 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Mon, 24 Nov 2008 05:49:59 +0000 Subject: 1.retried graphics library class from MdePkg 2.retried graphics library instance from MdeModulePkg 3.Move EnableQuietBoot(), DisableQuietBoot() and LockKeyboards() into GenericBdsLib git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6691 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 19 ++++++++++++++----- MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 2 +- .../Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) (limited to 'MdeModulePkg/Universal/SetupBrowserDxe') diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index ba39114..c1a79ab 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -217,10 +217,11 @@ SendForm ( OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest OPTIONAL ) { - EFI_STATUS Status; - UI_MENU_SELECTION *Selection; - UINTN Index; - FORM_BROWSER_FORMSET *FormSet; + EFI_STATUS Status; + UI_MENU_SELECTION *Selection; + UINTN Index; + FORM_BROWSER_FORMSET *FormSet; + EFI_CONSOLE_CONTROL_PROTOCOL *ConsoleControl; Status = EFI_SUCCESS; ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR)); @@ -282,7 +283,15 @@ SendForm ( // Ensure we are in Text mode // gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK)); - DisableQuietBoot (); + + Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl); + if (EFI_ERROR (Status)) { + return Status; + } + // + // Set console control to text mode. + // + ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText); for (Index = 0; Index < HandleCount; Index++) { Selection = AllocateZeroPool (sizeof (UI_MENU_SELECTION)); diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index 7366973..ac419d1 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -30,10 +30,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include -#include #include #include #include diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index 190b80c..2b6f72a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -62,7 +62,6 @@ BaseMemoryLib DebugLib PrintLib - GraphicsLib IfrSupportLib HiiLib ExtendedHiiLib @@ -76,6 +75,7 @@ gEfiHiiConfigRoutingProtocolGuid gEfiHiiDatabaseProtocolGuid gEfiUnicodeCollation2ProtocolGuid + gEfiConsoleControlProtocolGuid [FeaturePcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkHiiCompatibilitySupport -- cgit v1.1