From nobody Sun Apr 28 09:33:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1531476448218538.3140543541515; Fri, 13 Jul 2018 03:07:28 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 69C6F2096DCF4; Fri, 13 Jul 2018 03:07:27 -0700 (PDT) Received: from cam-smtp0.cambridge.arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 277E2211F887E for ; Fri, 13 Jul 2018 03:07:25 -0700 (PDT) Received: from E107992.Emea.Arm.com (e107992.emea.arm.com [10.1.211.7]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id w6DA7LRq013708; Fri, 13 Jul 2018 11:07:21 +0100 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.96.140; helo=cam-smtp0.cambridge.arm.com; envelope-from=alexei.fedorov@arm.com; receiver=edk2-devel@lists.01.org From: AlexeiFedorov To: edk2-devel@lists.01.org Date: Fri, 13 Jul 2018 11:07:21 +0100 Message-Id: <20180713100721.19224-1-Alexei.Fedorov@arm.com> X-Mailer: git-send-email 2.18.0.windows.1 Subject: [edk2] [PATCH v1] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 compilation errors X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nd@arm.com, Stephanie.Hughes-Fitt@arm.com MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch fixes VS2017 compilation errors for UefiShellAcpiViewCommandLib\Parsers\Gtdt\GtdtParser.c and UefiShellAcpiViewCommandLib\Parsers\Xsdt\XsdtParser.c reported in https://bugzilla.tianocore.org/show_bug.cgi?id=3D985 https://bugzilla.tianocore.org/show_bug.cgi?id=3D986 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Alexei Fedorov --- All the changes can be seen at https://github.com/AlexeiFedorov/edk2/tree/298_fix_acpiview_v1 Notes: v1: - GtdtParser.c DumpFTBlock() function: change UINT16 type of Length parameter to UINT32 change UINT16 type of GTBlockTimerLength variable to UINT32 - XsdtParser.c ParseAcpiXsdt() function: change name of local variable Ptr to SignaturePtr ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c | = 4 ++-- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c | 1= 2 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/Gtdt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtPa= rser.c index 3a3cee948ad8cd35ef3a6e13fec9d44300dbe73f..0ab460b02c9e062ac181e42e7e7= 7f875a40c86dc 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c @@ -161,12 +161,12 @@ STATIC VOID DumpGTBlock ( IN UINT8* Ptr, - IN UINT16 Length + IN UINT32 Length ) { UINT32 Index; UINT32 Offset; - UINT16 GTBlockTimerLength; + UINT32 GTBlockTimerLength; =20 Offset =3D ParseAcpi ( TRUE, diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/Xsdt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtPa= rser.c index 99521cd67a714065c2eb9e4e5ec0f2e21f4c9da9..014b6259aa9cfe4093b6f19d4ff= 0be1e8096fd9b 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c @@ -96,7 +96,7 @@ ParseAcpiXsdt ( CONST UINT8* Revision; =20 if ((UINT64*)(UINTN)(*TablePointer) !=3D NULL) { - UINT8* Ptr; + UINT8* SignaturePtr; =20 ParseAcpiHeader ( (UINT8*)(UINTN)(*TablePointer), @@ -105,17 +105,17 @@ ParseAcpiXsdt ( &Revision ); =20 - Ptr =3D (UINT8*)Signature; + SigPtr =3D (UINT8*)Signature; =20 UnicodeSPrint ( Buffer, sizeof (Buffer), L"Entry[%d] - %c%c%c%c", EntryIndex++, - Ptr[0], - Ptr[1], - Ptr[2], - Ptr[3] + SignaturePtr[0], + SignaturePtr[1], + SignaturePtr[2], + SignaturePtr[3] ); } else { UnicodeSPrint ( --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel