remove console control protocol consuming in DrawImage(), caller should make sure...

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

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index a0d34a31b91cabc6ec79e397790492af828223ae..5007c583758b24ae9331903c9a0c27dc5b3212f8 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -59,7 +59,6 @@
   UefiRuntimeServicesTableLib\r
 \r
 [Protocols]\r
   UefiRuntimeServicesTableLib\r
 \r
 [Protocols]\r

-  gEfiConsoleControlProtocolGuid                                        ## CONSUMES\r

   gEfiDevicePathProtocolGuid                                            ## SOMETIMES_CONSUMES\r
   gEfiHiiStringProtocolGuid                                             ## PRODUCES\r
   gEfiHiiImageProtocolGuid |PcdSupportHiiImageProtocol                  ## PRODUCES\r
   gEfiDevicePathProtocolGuid                                            ## SOMETIMES_CONSUMES\r
   gEfiHiiStringProtocolGuid                                             ## PRODUCES\r
   gEfiHiiImageProtocolGuid |PcdSupportHiiImageProtocol                  ## PRODUCES\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
index dc543b80e141b8aeac0f36fae8c6667b56ba76f1..8c74e8e424d2cf6572d0ffbd2c408157dfeec67c 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
@@ -1233,7 +1233,6 @@ HiiDrawImage (
   UINTN                               OffsetY2;\r
   EFI_FONT_DISPLAY_INFO               *FontInfo;\r
   UINTN                               Index;\r
   UINTN                               OffsetY2;\r
   EFI_FONT_DISPLAY_INFO               *FontInfo;\r
   UINTN                               Index;\r

-  EFI_CONSOLE_CONTROL_PROTOCOL        *Console;\r

 \r
   if (This == NULL || Image == NULL || Blt == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
 \r
   if (This == NULL || Image == NULL || Blt == NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -1323,17 +1322,10 @@ HiiDrawImage (
     // Draw the image to existing bitmap or screen depending on flag.\r
     //\r
     if ((Flags & EFI_HII_DIRECT_TO_SCREEN) == EFI_HII_DIRECT_TO_SCREEN) {\r
     // Draw the image to existing bitmap or screen depending on flag.\r
     //\r
     if ((Flags & EFI_HII_DIRECT_TO_SCREEN) == EFI_HII_DIRECT_TO_SCREEN) {\r

-      Status = gBS->LocateProtocol (\r
-                      &gEfiConsoleControlProtocolGuid,\r
-                      NULL,\r
-                      (VOID **) &Console\r
-                      );\r
-\r
-      if (EFI_ERROR (Status)) {\r
-        return Status;\r
-      }\r
+      //\r
+      // Caller should make sure the current UGA console is grarphic mode.\r
+      //\r

 \r
 \r

-      Console->SetMode (Console, EfiConsoleControlScreenGraphics);\r

       //\r
       // Write the image directly to the output device specified by Screen.\r
       //\r
       //\r
       // Write the image directly to the output device specified by Screen.\r
       //\r