Added Print, ErrorPrint, AsciiPrint, AsciiErrorPrint() to the UEFI Library.

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

5 files changed, 415 insertions, 1 deletions

diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h
index ef10f136b4..9eaf48cace 100644
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/MdePkg/Include/Library/UefiLib.h
@@ -616,4 +616,96 @@ EfiGetNameGuidFromFwVolDevicePathNode (
   IN CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *FvDevicePathNode

   );

 

+/** 

+  Prints a formatted Unicode string to the console output device specified by 

+  ConOut defined in the EFI_SYSTEM_TABLE.

+

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

+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode 

+  characters that printed to ConOut.  If the length of the formatted Unicode 

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.

+

+  @param Format   Null-terminated Unicode format string.

+  @param ...      VARARG list consumed to process Format.

+  If Format is NULL, then ASSERT().

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

+

+**/

+UINTN

+EFIAPI

+Print (

+  IN CONST CHAR16  *Format,

+  ...

+  );

+

+/** 

+  Prints a formatted Unicode string to the console output device specified by 

+  StdErr defined in the EFI_SYSTEM_TABLE.

+

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

+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode 

+  characters that printed to StdErr.  If the length of the formatted Unicode 

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.

+

+  @param Format   Null-terminated Unicode format string.

+  @param ...      VARARG list consumed to process Format.

+  If Format is NULL, then ASSERT().

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

+

+**/

+UINTN

+EFIAPI

+ErrorPrint (

+  IN CONST CHAR16  *Format,

+  ...

+  );

+

+/** 

+  Prints a formatted ASCII string to the console output device specified by 

+  ConOut defined in the EFI_SYSTEM_TABLE.

+

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

+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII 

+  characters that printed to ConOut.  If the length of the formatted ASCII 

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.

+

+  @param Format   Null-terminated ASCII format string.

+  @param ...      VARARG list consumed to process Format.

+  If Format is NULL, then ASSERT().

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

+

+**/

+UINTN

+EFIAPI

+AsciiPrint (

+  IN CONST CHAR8  *Format,

+  ...

+  );

+

+/** 

+  Prints a formatted ASCII string to the console output device specified by 

+  StdErr defined in the EFI_SYSTEM_TABLE.

+

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

+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII 

+  characters that printed to StdErr.  If the length of the formatted ASCII 

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.

+

+  @param Format   Null-terminated ASCII format string.

+  @param ...      VARARG list consumed to process Format.

+  If Format is NULL, then ASSERT().

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

+

+**/

+UINTN

+EFIAPI

+AsciiErrorPrint (

+  IN CONST CHAR8  *Format,

+  ...

+  );

+

 #endif

diff --git a/MdePkg/Library/UefiLib/UefiLib.msa b/MdePkg/Library/UefiLib/UefiLib.msa
index e2599e596f..19b5703a3f 100644
--- a/MdePkg/Library/UefiLib/UefiLib.msa
+++ b/MdePkg/Library/UefiLib/UefiLib.msa
@@ -43,11 +43,18 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>MemoryAllocationLib</Keyword>

     </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PcdLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PrintLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>UefiLib.c</Filename>

     <Filename>Console.c</Filename>

     <Filename>UefiNotTiano.c</Filename>

+    <Filename>UefiLibPrint.c</Filename>

   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

@@ -67,4 +74,11 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

   </Externs>

+  <PcdCoded>

+    <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">

+      <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>This PCD is used by UefiLib APIs, which are Print, ErrorPrint, AsciiPrint, AsciiErrorPrint. If the length of the formatted Unicode or ASCII string is greater than PcdUefiLibMaxPrintBufferSize, then only the first (PcdUefiLibMaxPrintBufferSize / Sizeof(CHAR16)) Unicode characters or PcdUefiLibMaxPrintBufferSize Ascii characters are sent to the respective console.</HelpText>

+    </PcdEntry>

+  </PcdCoded>

 </ModuleSurfaceArea>
\ No newline at end of file
diff --git a/MdePkg/Library/UefiLib/UefiLibPrint.c b/MdePkg/Library/UefiLib/UefiLibPrint.c
new file mode 100644
index 0000000000..493034e85f
--- /dev/null
+++ b/MdePkg/Library/UefiLib/UefiLibPrint.c
@@ -0,0 +1,259 @@
+/** @file

+  Mde UEFI library API implemention.

+  Print to StdErr or ConOut defined in EFI_SYSTEM_TABLE

+

+  Copyright (c) 2007, 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        

+  http://opensource.org/licenses/bsd-license.php                                            

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+**/

+

+/** 

+  Internal function which prints a formatted Unicode string to the console output device 

+  specified by Console

+

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

+  specified by Console and returns the number of Unicode characters that printed 

+  to it.  If the length of the formatted Unicode string is greater than PcdUefiLibMaxPrintBufferSize, 

+  then only the first PcdUefiLibMaxPrintBufferSize characters are sent to Console.

+

+  @param Format   Null-terminated Unicode format string.

+  @param Console  The output console.

+  @param Marker   VA_LIST marker for the variable argument list.

+  

+  If Format is NULL, then ASSERT().

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

+

+**/

+

+STATIC

+UINTN

+InternalPrint (

+  IN  CONST CHAR16                  *Format,

+  IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *Console,

+  IN  VA_LIST                       Marker

+  )

+{

+  UINTN   Return;

+  CHAR16  *Buffer;

+  UINTN   BufferSize;

+

+  ASSERT (Format != NULL);

+  ASSERT (((UINTN) Format & 0x01) == 0);

+

+  BufferSize = (PcdGet32 (PcdUefiLibMaxPrintBufferSize) + 1) * sizeof (CHAR16);

+  

+  Buffer = (CHAR16 *) AllocatePool(BufferSize);

+  ASSERT (Buffer != NULL);

+

+  Return = UnicodeVSPrint (Buffer, BufferSize, Format, Marker);

+

+  if (Console != NULL) {

+    //

+    // To be extra safe make sure ConOut has been initialized

+    //

+    Console->OutputString (Console, Buffer);

+  }

+

+  FreePool (Buffer);

+

+  return Return;  

+}

+

+/** 

+  Prints a formatted Unicode string to the console output device specified by 

+  ConOut defined in the EFI_SYSTEM_TABLE.

+

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

+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of Unicode 

+  characters that printed to ConOut.  If the length of the formatted Unicode 

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.

+

+  @param Format   Null-terminated Unicode format string.

+  @param ...      VARARG list consumed to process Format.

+  If Format is NULL, then ASSERT().

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

+

+**/

+UINTN

+EFIAPI

+Print (

+  IN CONST CHAR16  *Format,

+  ...

+  )

+{

+  VA_LIST Marker;

+  UINTN   Return;

+

+  VA_START (Marker, Format);

+

+  Return = InternalPrint (Format, gST->ConOut, Marker);

+

+  VA_END (Marker);

+

+  return Return;

+}

+

+/** 

+  Prints a formatted Unicode string to the console output device specified by 

+  StdErr defined in the EFI_SYSTEM_TABLE.

+

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

+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of Unicode 

+  characters that printed to StdErr.  If the length of the formatted Unicode 

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.

+

+  @param Format   Null-terminated Unicode format string.

+  @param ...      VARARG list consumed to process Format.

+  If Format is NULL, then ASSERT().

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

+

+**/

+

+UINTN

+EFIAPI

+ErrorPrint (

+  IN CONST CHAR16  *Format,

+  ...

+  )

+{

+  VA_LIST Marker;

+  UINTN   Return;

+

+  VA_START (Marker, Format);

+

+  Return = InternalPrint( Format, gST->StdErr, Marker);

+

+  VA_END (Marker);

+

+  return Return;

+}

+

+

+/** 

+  Internal function which prints a formatted ASCII string to the console output device 

+  specified by Console

+

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

+  specified by Console and returns the number of ASCII characters that printed 

+  to it.  If the length of the formatted ASCII string is greater than PcdUefiLibMaxPrintBufferSize, 

+  then only the first PcdUefiLibMaxPrintBufferSize characters are sent to Console.

+

+  @param Format   Null-terminated ASCII format string.

+  @param Console  The output console.

+  @param Marker   VA_LIST marker for the variable argument list.

+  

+  If Format is NULL, then ASSERT().

+  

+**/

+

+STATIC

+UINTN

+AsciiInternalPrint (

+  IN  CONST CHAR8                   *Format,

+  IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL  *Console,

+  IN  VA_LIST                       Marker

+  )

+{

+  UINTN   Return;

+  CHAR16  *Buffer;

+  UINTN   BufferSize;

+

+  ASSERT (Format != NULL);

+

+  BufferSize = (PcdGet32 (PcdUefiLibMaxPrintBufferSize) + 1) * sizeof (CHAR16);

+  

+  Buffer = (CHAR16 *) AllocatePool(BufferSize);

+  ASSERT (Buffer != NULL);

+

+  Return = UnicodeVSPrintAsciiFormat (Buffer, BufferSize, Format, Marker);

+

+  if (Console != NULL) {

+    //

+    // To be extra safe make sure ConOut has been initialized

+    //

+    Console->OutputString (Console, Buffer);

+  }

+

+  FreePool (Buffer);

+

+  return Return;  

+}

+

+/** 

+  Prints a formatted ASCII string to the console output device specified by 

+  ConOut defined in the EFI_SYSTEM_TABLE.

+

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

+  specified by ConOut in EFI_SYSTEM_TABLE and returns the number of ASCII 

+  characters that printed to ConOut.  If the length of the formatted ASCII 

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are sent to ConOut.

+

+  @param Format   Null-terminated ASCII format string.

+  @param ...      VARARG list consumed to process Format.

+  If Format is NULL, then ASSERT().

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

+

+**/

+UINTN

+EFIAPI

+AsciiPrint (

+  IN CONST CHAR8  *Format,

+  ...

+  )

+{

+  VA_LIST Marker;

+  UINTN   Return;

+

+  VA_START (Marker, Format);

+

+  Return = AsciiInternalPrint( Format, gST->ConOut, Marker);

+

+  VA_END (Marker);

+

+  return Return;

+}

+

+/** 

+  Prints a formatted ASCII string to the console output device specified by 

+  StdErr defined in the EFI_SYSTEM_TABLE.

+

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

+  specified by StdErr in EFI_SYSTEM_TABLE and returns the number of ASCII 

+  characters that printed to StdErr.  If the length of the formatted ASCII 

+  string is greater than PcdUefiLibMaxPrintBufferSize, then only the first 

+  PcdUefiLibMaxPrintBufferSize characters are sent to StdErr.

+

+  @param Format   Null-terminated ASCII format string.

+  @param ...      VARARG list consumed to process Format.

+  If Format is NULL, then ASSERT().

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

+

+**/

+UINTN

+EFIAPI

+AsciiErrorPrint (

+  IN CONST CHAR8  *Format,

+  ...

+  )

+{

+  VA_LIST Marker;

+  UINTN   Return;

+

+  VA_START (Marker, Format);

+

+  Return = AsciiInternalPrint( Format, gST->StdErr, Marker);

+

+  VA_END (Marker);

+

+  return Return;

+}

+

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 0d39529245..4a40a95526 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -478,6 +478,16 @@
       </ModuleSaBuildOptions>

     </ModuleSA>

     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9">

+      <PcdBuildDefinition>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

+      </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

         <FfsFormatKey>LIBRARY</FfsFormatKey>

@@ -1020,6 +1030,16 @@
       </ModuleSaBuildOptions>

     </ModuleSA>

     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9">

+      <PcdBuildDefinition>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

+      </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

         <FfsFormatKey>LIBRARY</FfsFormatKey>

@@ -1598,6 +1618,16 @@
       </ModuleSaBuildOptions>

     </ModuleSA>

     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9">

+      <PcdBuildDefinition>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

+      </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

         <FfsFormatKey>LIBRARY</FfsFormatKey>

@@ -2124,6 +2154,16 @@
       </ModuleSaBuildOptions>

     </ModuleSA>

     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9">

+      <PcdBuildDefinition>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

+      </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

         <FfsFormatKey>LIBRARY</FfsFormatKey>

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index a70622b1b4..331ae70603 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

+<?xml version="1.0" encoding="UTF-8"?>

 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <SpdHeader>

     <PackageName>MdePkg</PackageName>

@@ -2366,5 +2366,14 @@
       <DefaultValue>FALSE</DefaultValue>

       <HelpText>If this value is set TRUE, autogen will replace Driver Diagnostics Protocol instance with NULL.</HelpText>

     </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+      <Token>0x101</Token>

+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>UINT32</DatumType>

+      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

+      <DefaultValue>320</DefaultValue>

+      <HelpText>This PCD is used by UefiLib APIs, which are Print, ErrorPrint, AsciiPrint, AsciiErrorPrint. If the length of the formatted Unicode or ASCII string is greater than PcdUefiLibMaxPrintBufferSize, then only the first (PcdUefiLibMaxPrintBufferSize / Sizeof(CHAR16)) Unicode characters or PcdUefiLibMaxPrintBufferSize Ascii characters are sent to the respective console.</HelpText>

+    </PcdEntry>

   </PcdDeclarations>

 </PackageSurfaceArea>
\ No newline at end of file