1.Removed PrintXY from Graphics Library.

2.Added PrintXY and AsciiPrintXY in Uefi Library
3.Moved PcdUgaConsumeSupport from MdeModulePkg to MdePkg.

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

2 files changed, 99 insertions, 31 deletions

diff --git a/MdePkg/Include/Library/GraphicsLib.h b/MdePkg/Include/Library/GraphicsLib.h
index 37dc557..c54dcf8 100644
--- a/MdePkg/Include/Library/GraphicsLib.h
+++ b/MdePkg/Include/Library/GraphicsLib.h
@@ -17,9 +17,6 @@
 #ifndef __EFI_GRAPHICS_LIB_H__

 #define __EFI_GRAPHICS_LIB_H__

 

-#include <Protocol/GraphicsOutput.h>

-

-

 /**

   Return the graphics image file named FileNameGuid into Image and return it's

   size in ImageSize. All Firmware Volumes (FV) in the system are searched for the

@@ -146,32 +143,4 @@ LockKeyboards (
   IN  CHAR16    *Password

   );

 

-

-/**

-  Print Unicode string to graphics screen at the given X,Y coordinates of the graphics screen.

-  see definition of Print to find rules for constructing Fmt.

-

-  @param[in]  X            Row to start printing at

-  @param[in]  Y            Column to start printing at

-  @param[in]  ForeGround   Foreground color

-  @param[in]  BackGround   background color

-  @param[in]  Fmt          Print format sting. See definition of Print

-  @param ...               Variable argument list whose contents are accessed based on 

-                           the format string specified by Format.

-

-  @return  Number of Characters printed.

-

-**/

-UINTN

-EFIAPI

-PrintXY (

-  IN UINTN                            X,

-  IN UINTN                            Y,

-  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *ForeGround, OPTIONAL

-  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *BackGround, OPTIONAL

-  IN CHAR16                           *Fmt,

-  ...

-  );

-

-

 #endif

diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h
index c9da133..eeffdc0 100644
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/MdePkg/Include/Library/UefiLib.h
@@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/ComponentName2.h>

 #include <Protocol/DriverDiagnostics.h>

 #include <Protocol/DriverDiagnostics2.h>

+#include <Protocol/GraphicsOutput.h>

 

 #include <Library/BaseLib.h>

 

@@ -916,6 +917,104 @@ AsciiErrorPrint (
   );

 

 /**

+  Prints a formatted Unicode string to a graphics console device specified by 

+  ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.

+

+  This function prints a formatted Unicode string to the graphics console device 

+  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of 

+  Unicode characters printed.  If the length of the formatted Unicode string is

+  greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are printed.  The EFI_HII_FONT_PROTOCOL

+  is used to convert the string to a bitmap using the glyphs registered with the 

+  HII database.  No wrapping is performed, so any portions of the string the fall

+  outside the active display region will not be displayed.

+

+  If a graphics console device is not associated with the ConsoleOutputHandle 

+  defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.

+  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no 

+  string is printed, and 0 is returned.

+  If Format is NULL, then ASSERT().

+  If Format is not aligned on a 16-bit boundary, then ASSERT().

+

+  @param  X            X coordinate to print the string.

+  @param  Y            Y coordinate to print the string.

+  @param  ForeGround   The forground color of the string being printed.  This is

+                       an optional parameter that may be NULL.  If it is NULL,

+                       then the foreground color of the current ConOut device

+                       in the EFI_SYSTEM_TABLE is used.

+  @param  BackGround   The background color of the string being printed.  This is

+                       an optional parameter that may be NULL.  If it is NULL, 

+                       then the background color of the current ConOut device

+                       in the EFI_SYSTEM_TABLE is used.

+  @param  Format       Null-terminated Unicode format string.  See Print Library 

+                       for the supported format string syntax.

+  @param  ...          Variable argument list whose contents are accessed based on 

+                       the format string specified by Format.         

+

+  @return  The number of Unicode characters printed.

+

+**/

+UINTN

+EFIAPI

+PrintXY (

+  IN UINTN                            X,

+  IN UINTN                            Y,

+  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *ForeGround, OPTIONAL

+  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *BackGround, OPTIONAL

+  IN CONST CHAR16                     *Format,

+  ...

+  );

+

+/**

+  Prints a formatted ASCII string to a graphics console device specified by 

+  ConsoleOutputHandle defined in the EFI_SYSTEM_TABLE at the given (X,Y) coordinates.

+

+  This function prints a formatted ASCII string to the graphics console device 

+  specified by ConsoleOutputHandle in EFI_SYSTEM_TABLE and returns the number of 

+  ASCII characters printed.  If the length of the formatted ASCII string is

+  greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are printed.  The EFI_HII_FONT_PROTOCOL

+  is used to convert the string to a bitmap using the glyphs registered with the 

+  HII database.  No wrapping is performed, so any portions of the string the fall

+  outside the active display region will not be displayed.

+

+  If a graphics console device is not associated with the ConsoleOutputHandle 

+  defined in the EFI_SYSTEM_TABLE then no string is printed, and 0 is returned.

+  If the EFI_HII_FONT_PROTOCOL is not present in the handle database, then no 

+  string is printed, and 0 is returned.

+  If Format is NULL, then ASSERT().

+  If Format is not aligned on a 16-bit boundary, then ASSERT().

+

+  @param  X            X coordinate to print the string.

+  @param  Y            Y coordinate to print the string.

+  @param  ForeGround   The forground color of the string being printed.  This is

+                       an optional parameter that may be NULL.  If it is NULL,

+                       then the foreground color of the current ConOut device

+                       in the EFI_SYSTEM_TABLE is used.

+  @param  BackGround   The background color of the string being printed.  This is

+                       an optional parameter that may be NULL.  If it is NULL, 

+                       then the background color of the current ConOut device

+                       in the EFI_SYSTEM_TABLE is used.

+  @param  Format       Null-terminated ASCII format string.  See Print Library 

+                       for the supported format string syntax.

+  @param  ...          Variable argument list whose contents are accessed based on 

+                       the format string specified by Format.         

+

+  @return  The number of ASCII characters printed.

+

+**/

+UINTN

+EFIAPI

+AsciiPrintXY (

+  IN UINTN                            X,

+  IN UINTN                            Y,

+  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *ForeGround, OPTIONAL

+  IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL    *BackGround, OPTIONAL

+  IN CONST CHAR8                      *Format,

+  ...

+  );

+

+/**

   Initializes a driver by installing the Driver Binding Protocol onto the driver's

   DriverBindingHandle.  This is typically the same as the driver's ImageHandle, but

   it can be different if the driver produces multiple DriverBinding Protocols.