From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=nathaniel.l.desimone@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 75D71211E2C01 for ; Sun, 31 Mar 2019 22:19:24 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Mar 2019 22:19:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,295,1549958400"; d="scan'208";a="312053965" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by orsmga005.jf.intel.com with ESMTP; 31 Mar 2019 22:19:24 -0700 Received: from orsmsx159.amr.corp.intel.com (10.22.240.24) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 31 Mar 2019 22:19:24 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.54]) by ORSMSX159.amr.corp.intel.com ([169.254.11.117]) with mapi id 14.03.0415.000; Sun, 31 Mar 2019 22:19:23 -0700 From: "Desimone, Nathaniel L" To: "Gao, Zhichao" , "edk2-devel@lists.01.org" CC: Bret Barkelew , "Chiu, Chasel" , "Zeng, Star" , "Gao, Liming" , Sean Brogan , "Michael Turner" Thread-Topic: [PATCH V7 11/17] IntelFspPkg/BaseFspDebugLibSerialPort: Add new APIs Thread-Index: AQHU6CeYD79L4XFpsk+CyGaWJgHq/KYmxCdA Date: Mon, 1 Apr 2019 05:19:23 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AAE9B2CAC@ORSMSX114.amr.corp.intel.com> References: <20190401010821.6244-1-zhichao.gao@intel.com> <20190401010821.6244-12-zhichao.gao@intel.com> In-Reply-To: <20190401010821.6244-12-zhichao.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzZiMDY3ZTYtZmUwNC00NGI2LWI4Y2YtZWJkNzljOTQ2ZTUzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiWTlzbXJNdVFiYWlTQXhEQUZcLzFLM3lvd2J4Z2JEdVdaNTdJdVoyTTlMWk80cHhucllZeWZGZ3haNmxQcjViT0UifQ== x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Subject: Re: [PATCH V7 11/17] IntelFspPkg/BaseFspDebugLibSerialPort: Add new APIs X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2019 05:19:25 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: Gao, Zhichao=20 Sent: Sunday, March 31, 2019 6:08 PM To: edk2-devel@lists.01.org Cc: Bret Barkelew ; Chiu, Chasel ; Desimone, Nathaniel L ; Zeng, S= tar ; Gao, Liming ; Sean Brogan = ; Michael Turner Subject: [PATCH V7 11/17] IntelFspPkg/BaseFspDebugLibSerialPort: Add new AP= Is From: Bret Barkelew REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1395 Add new APIs' implementation (DebugVPrint, DebugBPrint) in the DebugLib ins= tance. These APIs would expose print routines with VaList parameter and Bas= eList parameter. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhichao Gao Cc: Chasel Chiu Cc: Nate DeSimone Cc: Star Zeng Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew Reviewed-by: Chasel Chiu --- .../BaseFspDebugLibSerialPort/DebugLib.c | 103 +++++++++++++++++- 1 file changed, 98 insertions(+), 5 deletions(-) diff --git a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c b/Int= elFspPkg/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 =20 - Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2019, Intel Corporation. All rights=20 + reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -28,6 +28,12 @@ =20 CONST CHAR8 *mHexTable =3D "0123456789ABCDEF"; =20 +// +// VA_LIST can not initialize to NULL for all compiler, so we use this=20 +to // indicate a null VA_LIST // +VA_LIST mVaListNull; + /** Get stack frame pointer of function call. =20 @@ -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=20 + function GetDebugPrintErrorLevel (), then print the message specified=20 + 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; =20 // // 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 =3D=3D NULL) { + AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker); }=20 + else { + AsciiBSPrint (Buffer, sizeof (Buffer), Format, BaseListMarker); } =20 // // Send the print string to a Serial Port @@ -98,6 +137,60 @@ DebugPrint= ( SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer)); } =20 +/** + 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=20 + function GetDebugPrintErrorLevel (), then print the message specified=20 + 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=20 + function GetDebugPrintErrorLevel (), then print the message specified=20 + 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. =20 -- 2.21.0.windows.1