From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=zhichao.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 4A3FF211DCD94 for ; Thu, 14 Mar 2019 02:04:24 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Mar 2019 02:04:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,477,1544515200"; d="scan'208";a="133980860" Received: from gaozhic-mobl.ccr.corp.intel.com ([10.239.196.107]) by orsmga003.jf.intel.com with ESMTP; 14 Mar 2019 02:04:22 -0700 From: Zhichao Gao To: edk2-devel@lists.01.org Cc: Michael D Kinney , Liming Gao , Sean Brogan , Michael Turner , Bret Barkelew Date: Thu, 14 Mar 2019 17:03:40 +0800 Message-Id: <20190314090351.14248-7-zhichao.gao@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20190314090351.14248-1-zhichao.gao@intel.com> References: <20190314090351.14248-1-zhichao.gao@intel.com> Subject: [PATCH 06/17] MdePkg/DxeRuntimeDebugLibSerialPort: Add a new api DebugVPrint 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: Thu, 14 Mar 2019 09:04:24 -0000 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1395 Add a new api DebugVPrint implementation in the DebugLib instance. This api would expose a print routine with VaList parameter. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhichao Gao Cc: Michael D Kinney Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew --- .../DxeRuntimeDebugLibSerialPort/DebugLib.c | 40 ++++++++++++++++++---- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c index e1266f77fa..e9811d2034 100644 --- a/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c +++ b/MdePkg/Library/DxeRuntimeDebugLibSerialPort/DebugLib.c @@ -4,7 +4,7 @@ been called, to prevent touching hardware that is no longer owned by the firmware. - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
Copyright (c) 2018, Linaro, Ltd. All rights reserved.
This program and the accompanying materials @@ -125,9 +125,40 @@ DebugPrint ( IN CONST CHAR8 *Format, ... ) +{ + VA_LIST Marker; + + ASSERT(Format != NULL); + + 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. + + 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(). + If the length of the message string specificed by Format is larger than the maximum allowable + record length, then directly return and not print it. + + @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 + ) { CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; - VA_LIST Marker; if (mEfiAtRuntime) { return; @@ -148,9 +179,7 @@ DebugPrint ( // // Convert the DEBUG() message to an ASCII String // - VA_START (Marker, Format); - AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker); - VA_END (Marker); + AsciiVSPrint (Buffer, sizeof (Buffer), Format, VaListMarker); // // Send the print string to a Serial Port @@ -158,7 +187,6 @@ DebugPrint ( SerialPortWrite ((UINT8 *)Buffer, AsciiStrLen (Buffer)); } - /** Prints an assert message containing a filename, line number, and description. This may be followed by a breakpoint or a dead loop. -- 2.16.2.windows.1