remove clean console control protocol.

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

2 files changed, 1 insertions, 30 deletions

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index 63deaf5986..be8820d9a0 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -550,34 +550,15 @@ ConSpliterGraphicsOutputBlt (
   )

 {

   EFI_STATUS                      Status;

+  EFI_STATUS                      ReturnStatus = EFI_DEVICE_ERROR;

   TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private;

   UINTN                           Index;

-  EFI_STATUS                      ReturnStatus;

   EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput;

   EFI_UGA_DRAW_PROTOCOL           *UgaDraw;

 

   Private = GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS (This);

 

   //

-  // Sync up DevNull GOP device

-  //

-  ReturnStatus = DevNullGraphicsOutputBlt (

-                  Private,

-                  BltBuffer,

-                  BltOperation,

-                  SourceX,

-                  SourceY,

-                  DestinationX,

-                  DestinationY,

-                  Width,

-                  Height,

-                  Delta

-                  );

-

-  if (Private->ConsoleOutputMode != EfiConsoleControlScreenGraphics) {

-    return ReturnStatus;

-  }

-  //

   // return the worst status met

   //

   for (Index = 0; Index < Private->CurrentNumberOfConsoles; Index++) {

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index fa992bd381..1096462306 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -213,7 +213,6 @@ SendForm (
   UI_MENU_SELECTION             *Selection;

   UINTN                         Index;

   FORM_BROWSER_FORMSET          *FormSet;

-  EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;

 

   Status = EFI_SUCCESS;

   ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));

@@ -276,15 +275,6 @@ SendForm (
   //

   gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));

 

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

     ASSERT (Selection != NULL);