1. Update internal EfiPrint protocol to contain all print interfaces provided by...

[mirror_edk2.git] / MdeModulePkg / Include / Protocol / Print.h

diff --git a/MdeModulePkg/Include/Protocol/Print.h b/MdeModulePkg/Include/Protocol/Print.h
index c381295f3176fb0f5dc46eb64585457560caa094..b640cb0b2f4286b1fe702d062692fa10297c3803 100644 (file)
--- a/MdeModulePkg/Include/Protocol/Print.h
+++ b/MdeModulePkg/Include/Protocol/Print.h
@@ -23,7 +23,7 @@ Abstract:
 #define __PPRINT_H__\r
 \r
 #define EFI_PRINT_PROTOCOL_GUID  \\r
-   { 0xdf2d868e, 0x32fc, 0x4cf0, {0x8e, 0x6b, 0xff, 0xd9, 0x5d, 0x13, 0x43, 0xd0 } }\r
+   { 0x5bcc3dbc, 0x8c57, 0x450a, { 0xbb, 0xc, 0xa1, 0xc0, 0xbd, 0xde, 0x48, 0xc } }\r
 \r
 //\r
 // Forward reference for pure ANSI compatability\r
@@ -33,18 +33,67 @@ typedef struct _EFI_PRINT_PROTOCOL  EFI_PRINT_PROTOCOL;
 \r
 typedef\r
 UINTN\r
-(EFIAPI *EFI_VSPRINT) (\r
+(EFIAPI *UNI_VSPRINT) (\r
   OUT CHAR16        *StartOfBuffer,\r
   IN  UINTN         BufferSize,\r
   IN  CONST CHAR16  *FormatString,\r
   IN  VA_LIST       Marker\r
   );\r
 \r
+typedef\r
+UINTN
+(EFIAPI *UNI_VSPRINT_ASCII) (
+  OUT CHAR16       *StartOfBuffer,
+  IN  UINTN        BufferSize,
+  IN  CONST CHAR8  *FormatString,
+  IN  VA_LIST      Marker
+  );\r
+\r
+typedef\r
+UINTN
+(EFIAPI *VALUE_TO_UNISTRING) (
+  IN OUT CHAR16  *Buffer,
+  IN UINTN       Flags,
+  IN INT64       Value,
+  IN UINTN       Width
+  );\r
+\r
+typedef\r
+UINTN
+(EFIAPI *ASCII_VSPRINT) (
+  OUT CHAR8         *StartOfBuffer,
+  IN  UINTN         BufferSize,
+  IN  CONST CHAR8   *FormatString,
+  IN  VA_LIST       Marker
+  );\r
+\r
+typedef\r
+UINTN
+(EFIAPI *ASCII_VSPRINT_UNI) (
+  OUT CHAR8         *StartOfBuffer,
+  IN  UINTN         BufferSize,
+  IN  CONST CHAR16  *FormatString,
+  IN  VA_LIST       Marker
+  );\r
+\r
+typedef\r
+UINTN
+(EFIAPI *VALUE_TO_ASCIISTRING) (
+  IN OUT CHAR8  *Buffer,
+  IN UINTN      Flags,
+  IN INT64      Value,
+  IN UINTN      Width
+  );\r
+\r
 struct _EFI_PRINT_PROTOCOL {\r
-  EFI_VSPRINT                                   VSPrint;\r
+  UNI_VSPRINT               VSPrint;\r
+  UNI_VSPRINT_ASCII         UniVSPrintAscii;\r
+  VALUE_TO_UNISTRING        UniValueToString;                         \r
+  ASCII_VSPRINT             AsciiVSPrint;          \r
+  ASCII_VSPRINT_UNI         AsciiVSPrintUni;\r
+  VALUE_TO_ASCIISTRING      AsciiValueToString;\r
 };\r
 \r
-\r
 extern EFI_GUID gEfiPrintProtocolGuid;\r
 \r
 #endif\r