No change from V4. Reviewed-by: Chasel Chiu <chasel.c...@intel.com>
> -----Original Message----- > From: Gao, Zhichao > Sent: Thursday, March 28, 2019 4:10 PM > To: edk2-devel@lists.01.org > Cc: Bret Barkelew <bret.barke...@microsoft.com>; Chiu, Chasel > <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Zeng, Star <star.z...@intel.com>; Gao, > Liming <liming....@intel.com>; Sean Brogan <sean.bro...@microsoft.com>; > Michael Turner <michael.tur...@microsoft.com> > Subject: [PATCH V5 11/17] IntelFspPkg/BaseFspDebugLibSerialPort: Add new > APIs > > From: Bret Barkelew <bret.barke...@microsoft.com> > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1395 > > Add new APIs' implementation (DebugVPrint, DebugBPrint) in the DebugLib > instance. These APIs would expose print routines with VaList parameter and > BaseList parameter. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Zhichao Gao <zhichao....@intel.com> > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Star Zeng <star.z...@intel.com> > Cc: Liming Gao <liming....@intel.com> > Cc: Sean Brogan <sean.bro...@microsoft.com> > Cc: Michael Turner <michael.tur...@microsoft.com> > Cc: Bret Barkelew <bret.barke...@microsoft.com> > Reviewed-by: Chasel Chiu <chasel.c...@intel.com> > --- > .../BaseFspDebugLibSerialPort/DebugLib.c | 103 +++++++++++++++++- > 1 file changed, 98 insertions(+), 5 deletions(-) > > diff --git a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c > b/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c > index 73bb08e357..8b322c038e 100644 > --- a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c > +++ b/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c > @@ -1,6 +1,6 @@ > /** @file > > - Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2014 - 2019, Intel Corporation. All rights > + reserved.<BR> > 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 @@ -28,6 +28,12 @@ > > CONST CHAR8 *mHexTable = "0123456789ABCDEF"; > > +// > +// VA_LIST can not initialize to NULL for all compiler, so we use this > +to // indicate a null VA_LIST // > +VA_LIST mVaListNull; > + > /** > Get stack frame pointer of function call. > > @@ -62,9 +68,40 @@ DebugPrint ( > IN CONST CHAR8 *Format, > ... > ) > +{ > + VA_LIST Marker; > + > + VA_START (Marker, Format); > + DebugVPrint (ErrorLevel, Format, Marker); > + VA_END (Marker); > +} > + > +/** > + Prints a debug message to the debug output device if the specified > + error level is enabled base on Null-terminated format string and a > + VA_LIST argument list or a BASE_LIST argument list. > + > + If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib > + function GetDebugPrintErrorLevel (), then print the message specified > + by Format and the associated variable argument list to the debug output > device. > + > + If Format is NULL, then ASSERT(). > + > + @param ErrorLevel The error level of the debug message. > + @param Format Format string for the debug message to print. > + @param VaListMarker VA_LIST marker for the variable argument list. > + @param BaseListMarker BASE_LIST marker for the variable argument list. > + > +**/ > +VOID > +DebugPrintMarker ( > + IN UINTN ErrorLevel, > + IN CONST CHAR8 *Format, > + IN VA_LIST VaListMarker, > + IN BASE_LIST BaseListMarker > + ) > { > CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; > - VA_LIST Marker; > > // > // If Format is NULL, then ASSERT(). > @@ -88,9 +125,11 @@ DebugPrint ( > // > // Convert the DEBUG() message to an ASCII String > // > - VA_START (Marker, Format); > - AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker); > - VA_END (Marker); > + if (BaseListMarker == NULL) { > + AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker); } > + else { > + AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker); } > > // > // Send the print string to a Serial Port @@ -98,6 +137,60 @@ DebugPrint ( > SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer)); } > > +/** > + Prints a debug message to the debug output device if the specified > + error level is enabled. > + > + If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib > + function GetDebugPrintErrorLevel (), then print the message specified > + by Format and the associated variable argument list to the debug output > device. > + > + If Format is NULL, then ASSERT(). > + > + @param ErrorLevel The error level of the debug message. > + @param Format Format string for the debug message to print. > + @param VaListMarker VA_LIST marker for the variable argument list. > + > +**/ > +VOID > +EFIAPI > +DebugVPrint ( > + IN UINTN ErrorLevel, > + IN CONST CHAR8 *Format, > + IN VA_LIST VaListMarker > + ) > +{ > + DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL); } > + > +/** > + Prints a debug message to the debug output device if the specified > + error level is enabled. > + This function use BASE_LIST which would provide a more compatible > + service than VA_LIST. > + > + If any bit in ErrorLevel is also set in DebugPrintErrorLevelLib > + function GetDebugPrintErrorLevel (), then print the message specified > + by Format and the associated variable argument list to the debug output > device. > + > + If Format is NULL, then ASSERT(). > + > + @param ErrorLevel The error level of the debug message. > + @param Format Format string for the debug message to print. > + @param BaseListMarker BASE_LIST marker for the variable argument list. > + > +**/ > +VOID > +EFIAPI > +DebugBPrint ( > + IN UINTN ErrorLevel, > + IN CONST CHAR8 *Format, > + IN BASE_LIST BaseListMarker > + ) > +{ > + DebugPrintMarker (ErrorLevel, Format, mVaListNull, BaseListMarker); } > + > /** > Convert an UINT32 value into HEX string sepcified by Buffer. > > -- > 2.21.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
