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 3A90E211DCD94 for ; Thu, 14 Mar 2019 02:04:21 -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:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,477,1544515200"; d="scan'208";a="133980844" Received: from gaozhic-mobl.ccr.corp.intel.com ([10.239.196.107]) by orsmga003.jf.intel.com with ESMTP; 14 Mar 2019 02:04:19 -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:38 +0800 Message-Id: <20190314090351.14248-5-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 04/17] MdePkg/UefidebugLibConOut: 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:21 -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 --- MdePkg/Library/UefiDebugLibConOut/DebugLib.c | 44 ++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c b/MdePkg/Library/UefiDebugLibConOut/DebugLib.c index f04207c93f..4028098f92 100644 --- a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c +++ b/MdePkg/Library/UefiDebugLibConOut/DebugLib.c @@ -1,7 +1,7 @@ /** @file UEFI Debug Library that sends messages to the Console Output Device in the EFI System Table. - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2019, Intel Corporation. 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 @@ -50,9 +50,44 @@ DebugPrint ( ... ) { - CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; VA_LIST Marker; + ASSERT(Format != NULL); + + // + // Convert the DEBUG() message to a Unicode String + // + 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 + ) +{ + CHAR16 Buffer[MAX_DEBUG_MESSAGE_LENGTH]; + // // If Format is NULL, then ASSERT(). // @@ -68,9 +103,7 @@ DebugPrint ( // // Convert the DEBUG() message to a Unicode String // - VA_START (Marker, Format); - UnicodeVSPrintAsciiFormat (Buffer, MAX_DEBUG_MESSAGE_LENGTH, Format, Marker); - VA_END (Marker); + UnicodeVSPrintAsciiFormat (Buffer, MAX_DEBUG_MESSAGE_LENGTH, Format, VaListMarker); // @@ -81,7 +114,6 @@ DebugPrint ( } } - /** 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