From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.54]) by mx.groups.io with SMTP id smtpd.web12.8383.1620383916413403550 for ; Fri, 07 May 2021 03:38:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=GrVGGsG8; spf=pass (domain: arm.com, ip: 40.107.15.54, mailfrom: joey.gouly@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AOPG57gp77WetjHGM/Ze+4DZe7UhA+Hq6DnHbZA2css=; b=GrVGGsG8FtkttzTjtK93Ew8jF0JjEF1Qc27a13aY10fQD9fomD0UA+5VYJAo4AUet0w7uP4cDM/dIIpeH0ICcajREaCdDX4Rrc1FGgndt7WGkJKqlaopvNNAfN0A+kt++o5k5oe/1qVRuQwTpju+SgWPE6KI2YEFL8MtWIR0WQA= Received: from AM5PR0601CA0080.eurprd06.prod.outlook.com (2603:10a6:206::45) by DBBPR08MB6105.eurprd08.prod.outlook.com (2603:10a6:10:20d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 10:38:29 +0000 Received: from AM5EUR03FT043.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:0:cafe::f6) by AM5PR0601CA0080.outlook.office365.com (2603:10a6:206::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 10:38:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT043.mail.protection.outlook.com (10.152.17.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 10:38:27 +0000 Received: ("Tessian outbound 52fcc5bd9d3a:v91"); Fri, 07 May 2021 10:38:27 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 9aee4c5c15bc87ec X-CR-MTA-TID: 64aa7808 Received: from b3f028c6dcb6.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id FDFED41D-2B9F-41B5-BC03-A100FF88E3D1.1; Fri, 07 May 2021 10:38:16 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b3f028c6dcb6.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 07 May 2021 10:38:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UI494/Fii1Bz3Xz7Oa4ex8Z0CLbmV9/qwlQYRl1CsV+c3azGbcFkahUG57V8KeYkSsXTXKfcDRBiOlYKpCw+JT4qSBxEuQykego2LAIdvr3DaIerVzaRbX/ZBroxnNn9Iuq94y3VTl06/hUJWIz73/56skR6rFWbt3Oo/jBadn1d/EfrDMpxwT8BSpGHqavcyE7bi/nfqNY/taE5ny+cPn7LiAKqG7v2noWOyyEIf/98YXVj6WYpUCWD2hA9OKeRMostDU18WDrRxIXDhQbbYnddW+mys+okxisdJWeVPUfuPAREoevBXGSg1axJ9nJM9nB1XnMyvSvSyN5/d/b0qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AOPG57gp77WetjHGM/Ze+4DZe7UhA+Hq6DnHbZA2css=; b=mjPwXrZ6Q2Qg7LG8Eam6YpsidjDoFgFNN7yEKt/O3dcGIdqBPYFuN9L+txE+KZSlsJPtPeWCc/nVCWlYgerZDdeTp9HP4yX7Yshzdqec3rMxbT6USRkmZ+VVyYOQxJOKxCdexwoE3mrqQZf4z6O7JxtJyp0CflgM2cPY2eEe31JsZHT4LPldrNGbTh/ZgDotjF1UASeQMqJIQrtc0NfgxdBMg3XkNZEdJxV+KClR1/A2svOXSNLXQUc//DrjsBHBGFDqZLmRckP5R3lT6qSJ1PG/mncWnr3j7hZ+tbx6hK6U1wSUDbaini7PxC84suC5JgUVdNt1BM3G5Mbbo9Qeyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AOPG57gp77WetjHGM/Ze+4DZe7UhA+Hq6DnHbZA2css=; b=GrVGGsG8FtkttzTjtK93Ew8jF0JjEF1Qc27a13aY10fQD9fomD0UA+5VYJAo4AUet0w7uP4cDM/dIIpeH0ICcajREaCdDX4Rrc1FGgndt7WGkJKqlaopvNNAfN0A+kt++o5k5oe/1qVRuQwTpju+SgWPE6KI2YEFL8MtWIR0WQA= Received: from AM6PR0202CA0048.eurprd02.prod.outlook.com (2603:10a6:20b:3a::25) by VI1PR08MB4160.eurprd08.prod.outlook.com (2603:10a6:803:ea::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Fri, 7 May 2021 10:38:13 +0000 Received: from AM5EUR03FT033.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::c) by AM6PR0202CA0048.outlook.office365.com (2603:10a6:20b:3a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 10:38:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT033.mail.protection.outlook.com (10.152.16.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 10:38:12 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 7 May 2021 10:38:04 +0000 Received: from e124191.cambridge.arm.com (10.11.7.12) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2176.2 via Frontend Transport; Fri, 7 May 2021 10:38:04 +0000 From: "Joey Gouly" To: CC: , , , , Subject: [PATCH v1 1/5] ShellPkg: Replace 'Trace' parameter with 'ParseFlags' Date: Fri, 7 May 2021 11:38:00 +0100 Message-ID: <20210507103804.8131-2-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210507103804.8131-1-joey.gouly@arm.com> References: <20210507103804.8131-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e32aa6d-1075-45ee-c05a-08d911444015 X-MS-TrafficTypeDiagnostic: VI1PR08MB4160:|DBBPR08MB6105: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3826;OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 6Oy5Kb1C1FWqeRQa4m9HUrhyT46w7itkGRpPCd3/mNPrBi7SggHcLxl0ArRYEfPbWeyj3Vd9DSMjn8NLelTGfaf/5PLSuKnRfTPdLKsF+2lTsKM3pwGZ1V5+GhFP+qeg84OeqvjwL4N6liTj1Yot/16gZx3lYZvJntzRSNLC2EJRdggT3+o3/5hS9ktmQkamjMLbZEnYbD9ong5X98hoYkiEcdKzoxkLDuwSbUKFy53C0sTXIFhIoFIQF6Fu6DTyUgPHk+TvEc5EGhWG7hXDOHmjpB6YKWyV58JS9YVsZaIJMrSZpaiYetL/9WKsd++SMo0ayfZhLjjHO67u6CcnxK0KFCwRRB2cVj4kkapVty8kZagOrXlrrq+cAfyx6F1fxnOTgYlVVRbcxUTUk7VsLfoWfQ9nQnEgnEA4HLGPicnazsjCT5OKSCHvnl58ot4dTcORsBUjVCGM7SxEVcAtjMN08WReTIGkO6KCQOGCVRSFPMtk5/9m6UkSHhjLqOVd4jDnzbOAIwbZiSutK+beLbuEo6ptfqDM4uAk3CFxci+Mlp63NivMGHXX5abGtdNwQdhZzca9UweoIIifJM1NHFJx7oleAhosZubJWvP8igr7nMToyLmpmDTkdHuvhvKqkdXVhDWj3NbblzhewtXKeSnpcZUgU0M5MkjX3Y+qsR0plqAOe0Cqlp/8e6dkxU+WowFdxgVmyMnAW/azZGlZXOVo+101Dz7BzDoyB6+Dq5SOe2eng8e7vTQr3B9v4HybTintv4Ivfa6NK+NgMyUnjQ== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(136003)(346002)(396003)(376002)(39850400004)(36840700001)(46966006)(186003)(30864003)(19627235002)(7696005)(47076005)(70206006)(6666004)(6916009)(54906003)(36756003)(36860700001)(1076003)(82740400003)(356005)(4326008)(478600001)(316002)(426003)(86362001)(5660300002)(70586007)(83380400001)(26005)(2616005)(2906002)(8936002)(44832011)(336012)(81166007)(82310400003)(8676002)(36900700001)(579004);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4160 Return-Path: Joey.Gouly@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT043.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 5a3f805a-ec75-4864-3753-08d9114436f5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CQLwkosqwrkXraR4DNIqYsYsz/xx5doVbOih46IIcnk7O5Ao1Me2hkKZq7cYpENlVR/QVU9qaQZrv+dOHz9mizx0MW7PLqfTiWZv0KzwPisz9Pr5ORXb/QIQmEYxC5FYzxPqX5bFMHsHC+wUZId+pPJcQJoHW+58+Nvb6haMXQQIlpJGLwiUVLX76ZkkM1ltsXpu6SLuCg1r5G7m+MvZHYnbd+JbZX6FIFYg7RUIJcR+mj8QMYxHYHl9JZ7sr1tHDQfRKfhbyjecD6fxRd+4xjIWBsmKt2b8pQc96i52QImWYVjgxXpGyAQcGabN+195MqLX6nemGH9hOHrgDvfREK+wG/EMyFaCNly7qVYXFklrMBekLq1H9tVJtV6/c0+3w/w9xy+amPbromix33U1K7Vfqpjzv/aVMI5v5QBlCv++DEEJ+DV7PJ9JMGy7jxN2kWc+dU2En4VmldheA545hidVgZPc56sLyio5iX4k4AqHXr2BSK0KIAgbg7EMPNDReGiraL1+bHVvDvOKlOELhELT8f0RLzcCFio2NncXqx8WvxSohTXrPYhnixHPqTkBsmEKg21uNjgvZK90yRy2zJhSOOW1eNMQY/AiCeZw2AHBkzbGxPXPPnApltHiqyjcwxuF/s1/xY04UCBNKC0Z6LqN6FDmpKu1dSQgTJm5viVv+vMq3SlJXdL6Q9Yewaq22gOReaQsy9DE0rLcd866OWyxWkDX0ya5j73mrcaDIJQ= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(346002)(136003)(39850400004)(376002)(396003)(46966006)(36840700001)(47076005)(2906002)(8936002)(82740400003)(81166007)(86362001)(316002)(30864003)(426003)(186003)(83380400001)(5660300002)(6666004)(1076003)(36756003)(478600001)(19627235002)(82310400003)(336012)(6916009)(2616005)(7696005)(4326008)(54906003)(26005)(70586007)(70206006)(44832011)(36860700001)(8676002)(579004);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 10:38:27.9487 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e32aa6d-1075-45ee-c05a-08d911444015 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT043.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6105 Content-Type: text/plain From: Marc Moisson-Franckhauser Bugzilla: 3378 (https://bugzilla.tianocore.org/show_bug.cgi?id=3378) This is preparation for adding a second flag to the parsers. Signed-off-by: Marc Moisson-Franckhauser Signed-off-by: Joey Gouly --- ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h | 77 +++++++++++--------- ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h | 6 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c | 20 ++--- ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c | 28 ++++--- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Bgrt/BgrtParser.c | 10 +-- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dsdt/DsdtParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Facs/FacsParser.c | 10 +-- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c | 27 ++++--- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Mcfg/McfgParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c | 47 +++++++----- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c | 10 +-- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ssdt/SsdtParser.c | 8 +- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c | 10 +-- 20 files changed, 179 insertions(+), 146 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h index 0b7726b9d5807ad2f5c5447408c4c5451718938b..b078c0b99335ba28f7589cac6b0a4190d9a6c3b5 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h @@ -1,7 +1,7 @@ /** @file Header file for ACPI parser - Copyright (c) 2016 - 2020, Arm Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -16,6 +16,16 @@ /// that allows us to process the log options. #define RSDP_TABLE_INFO SIGNATURE_32('R', 'S', 'D', 'P') +/** + Flags for the parser. +*/ +#define PARSE_FLAGS_TRACE BIT0 + +/** + Helper macros to test parser flags. +*/ +#define IS_TRACE_FLAG_SET(Flags) (((Flags) & PARSE_FLAGS_TRACE) != 0) + /** This function increments the ACPI table error counter. **/ @@ -489,7 +499,7 @@ ParseAcpiAest ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -497,7 +507,7 @@ ParseAcpiAest ( VOID EFIAPI ParseAcpiBgrt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -510,7 +520,7 @@ ParseAcpiBgrt ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -518,7 +528,7 @@ ParseAcpiBgrt ( VOID EFIAPI ParseAcpiDbg2 ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -531,7 +541,7 @@ ParseAcpiDbg2 ( For the DSDT table only the ACPI header fields are parsed and traced. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -539,7 +549,7 @@ ParseAcpiDbg2 ( VOID EFIAPI ParseAcpiDsdt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -552,7 +562,7 @@ ParseAcpiDsdt ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -560,7 +570,7 @@ ParseAcpiDsdt ( VOID EFIAPI ParseAcpiFacs ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -573,7 +583,7 @@ ParseAcpiFacs ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -581,7 +591,7 @@ ParseAcpiFacs ( VOID EFIAPI ParseAcpiFadt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -598,7 +608,7 @@ ParseAcpiFadt ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -606,7 +616,7 @@ ParseAcpiFadt ( VOID EFIAPI ParseAcpiGtdt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -653,7 +663,7 @@ ParseAcpiHmat ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -661,7 +671,7 @@ ParseAcpiHmat ( VOID EFIAPI ParseAcpiIort ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -682,7 +692,7 @@ ParseAcpiIort ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -690,7 +700,7 @@ ParseAcpiIort ( VOID EFIAPI ParseAcpiMadt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -703,7 +713,7 @@ ParseAcpiMadt ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -711,7 +721,7 @@ ParseAcpiMadt ( VOID EFIAPI ParseAcpiMcfg ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -746,7 +756,7 @@ ParseAcpiPcct ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -754,7 +764,7 @@ ParseAcpiPcct ( VOID EFIAPI ParseAcpiPptt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -769,7 +779,7 @@ ParseAcpiPptt ( This function also performs a RAW dump of the ACPI table and validates the checksum. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -777,7 +787,7 @@ ParseAcpiPptt ( VOID EFIAPI ParseAcpiRsdp ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -793,7 +803,8 @@ ParseAcpiRsdp ( - Relative distance from System Locality at i*N+j is same as j*N+i - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to + do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -801,7 +812,7 @@ ParseAcpiRsdp ( VOID EFIAPI ParseAcpiSlit ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -814,7 +825,7 @@ ParseAcpiSlit ( This function also performs validations of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -822,7 +833,7 @@ ParseAcpiSlit ( VOID EFIAPI ParseAcpiSpcr ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -841,7 +852,7 @@ ParseAcpiSpcr ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -849,7 +860,7 @@ ParseAcpiSpcr ( VOID EFIAPI ParseAcpiSrat ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -862,7 +873,7 @@ ParseAcpiSrat ( For the SSDT table only the ACPI header fields are parsed and traced. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -870,7 +881,7 @@ ParseAcpiSrat ( VOID EFIAPI ParseAcpiSsdt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -882,7 +893,7 @@ ParseAcpiSsdt ( This function also performs validation of the XSDT table. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -890,7 +901,7 @@ ParseAcpiSsdt ( VOID EFIAPI ParseAcpiXsdt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h index 0ebf79fb653ae3a8190273aee452723c6213eb58..94ce0a4860e5296d99d398480655a8013ab0f240 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.h @@ -1,7 +1,7 @@ /** @file Header file for ACPI table parser - Copyright (c) 2016 - 2020, Arm Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -20,7 +20,7 @@ /** A function that parses the ACPI table. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -28,7 +28,7 @@ typedef VOID (EFIAPI * PARSE_ACPI_TABLE_PROC) ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c index 4b618f131eac3957f4070a95e06c8cd157c3223c..ecb5d6339af37397c6ba1ba4c8f0d42a95811bf6 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c @@ -1,7 +1,7 @@ /** @file ACPI table parser - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Glossary: @@ -183,7 +183,7 @@ ProcessAcpiTable ( ) { EFI_STATUS Status; - BOOLEAN Trace; + UINT8 ParseFlags; CONST UINT32* AcpiTableSignature; CONST UINT32* AcpiTableLength; CONST UINT8* AcpiTableRevision; @@ -197,13 +197,13 @@ ProcessAcpiTable ( &AcpiTableRevision ); - Trace = ProcessTableReportOptions ( - *AcpiTableSignature, - Ptr, - *AcpiTableLength - ); + ParseFlags = ProcessTableReportOptions ( + *AcpiTableSignature, + Ptr, + *AcpiTableLength + ); - if (Trace) { + if (IS_TRACE_FLAG_SET (ParseFlags)) { DumpRaw (Ptr, *AcpiTableLength); // Do not process the ACPI table any further if the table length read @@ -236,14 +236,14 @@ ProcessAcpiTable ( Status = GetParser (*AcpiTableSignature, &ParserProc); if (EFI_ERROR (Status)) { // No registered parser found, do default handling. - if (Trace) { + if (IS_TRACE_FLAG_SET (ParseFlags)) { DumpAcpiHeader (Ptr); } return; } ParserProc ( - Trace, + ParseFlags, Ptr, *AcpiTableLength, *AcpiTableRevision diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c index 9a5b013fb234e2a09a12a690607b5b871dffde72..a4242ba9d99b05d07c829520c4011439445aadb0 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Glossary: @@ -73,9 +73,9 @@ DumpAcpiTableToFile ( @param [in] TablePtr Pointer to the ACPI table data. @param [in] Length The length fo the ACPI table. - @retval Returns TRUE if the ACPI table should be traced. + @retval Returns the ParseFlags for the ACPI table. **/ -BOOLEAN +UINT8 ProcessTableReportOptions ( IN CONST UINT32 Signature, IN CONST UINT8* TablePtr, @@ -84,7 +84,7 @@ ProcessTableReportOptions ( { UINTN OriginalAttribute; UINT8 *SignaturePtr; - BOOLEAN Log; + UINT8 ParseFlags; BOOLEAN HighLight; SELECTED_ACPI_TABLE *SelectedTable; @@ -93,17 +93,17 @@ ProcessTableReportOptions ( // OriginalAttribute = 0; SignaturePtr = (UINT8*)(UINTN)&Signature; - Log = FALSE; + ParseFlags = 0; HighLight = GetColourHighlighting (); GetSelectedAcpiTable (&SelectedTable); switch (GetReportOption ()) { case ReportAll: - Log = TRUE; + ParseFlags |= PARSE_FLAGS_TRACE; break; case ReportSelected: if (Signature == SelectedTable->Type) { - Log = TRUE; + ParseFlags |= PARSE_FLAGS_TRACE; SelectedTable->Found = TRUE; } break; @@ -143,7 +143,7 @@ ProcessTableReportOptions ( break; } // switch - if (Log) { + if (IS_TRACE_FLAG_SET (ParseFlags)) { if (HighLight) { OriginalAttribute = gST->ConOut->Mode->Attribute; gST->ConOut->SetAttribute ( @@ -164,7 +164,7 @@ ProcessTableReportOptions ( } } - return Log; + return ParseFlags; } @@ -196,7 +196,7 @@ AcpiView ( UINT32 RsdpLength; UINT8 RsdpRevision; PARSE_ACPI_TABLE_PROC RsdpParserProc; - BOOLEAN Trace; + UINT8 ParseFlags; SELECTED_ACPI_TABLE *SelectedTable; // @@ -249,7 +249,11 @@ AcpiView ( // The RSDP length is 4 bytes starting at offset 20 RsdpLength = *(UINT32*)(RsdpPtr + RSDP_LENGTH_OFFSET); - Trace = ProcessTableReportOptions (RSDP_TABLE_INFO, RsdpPtr, RsdpLength); + ParseFlags = ProcessTableReportOptions ( + RSDP_TABLE_INFO, + RsdpPtr, + RsdpLength + ); Status = GetParser (RSDP_TABLE_INFO, &RsdpParserProc); if (EFI_ERROR (Status)) { @@ -260,7 +264,7 @@ AcpiView ( } RsdpParserProc ( - Trace, + ParseFlags, RsdpPtr, RsdpLength, RsdpRevision diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Bgrt/BgrtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Bgrt/BgrtParser.c index 1a180271a4ebe47948b7f0b56d1cb6f81b5fdf13..6bd4c35bec85e038875ce3d9548c9139b1de2755 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Bgrt/BgrtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Bgrt/BgrtParser.c @@ -1,7 +1,7 @@ /** @file BGRT table parser - Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -36,7 +36,7 @@ STATIC CONST ACPI_PARSER BgrtParser[] = { This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -44,18 +44,18 @@ STATIC CONST ACPI_PARSER BgrtParser[] = { VOID EFIAPI ParseAcpiBgrt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision ) { - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } ParseAcpi ( - Trace, + TRUE, 0, "BGRT", Ptr, diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c index 9df111ecaa7d7a703a13a39c243ed78b9f12ee97..a22f8ab76b84432b2073bea6ca6d8245ea9df7fb 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c @@ -1,7 +1,7 @@ /** @file DBG2 table parser - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -212,7 +212,7 @@ DumpDbgDeviceInfo ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -220,7 +220,7 @@ DumpDbgDeviceInfo ( VOID EFIAPI ParseAcpiDbg2 ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -229,7 +229,7 @@ ParseAcpiDbg2 ( UINT32 Offset; UINT32 Index; - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dsdt/DsdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dsdt/DsdtParser.c index 6d43974f54d23fd9990fa7af721c96518bb96a36..609c17ef02d460be66f0c390203cae55ece653e3 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dsdt/DsdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dsdt/DsdtParser.c @@ -1,7 +1,7 @@ /** @file DSDT table parser - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -20,7 +20,7 @@ For the DSDT table only the ACPI header fields are parsed and traced. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -28,13 +28,13 @@ VOID EFIAPI ParseAcpiDsdt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision ) { - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Facs/FacsParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Facs/FacsParser.c index d6bea86bdbaa79aa35b86840c809394b3c7a3bf6..d7545b6161eadd24e986a7828910662f2f52b2ec 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Facs/FacsParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Facs/FacsParser.c @@ -1,7 +1,7 @@ /** @file FACS table parser - Copyright (c) 2019, ARM Limited. All rights reserved. + Copyright (c) 2019 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -42,7 +42,7 @@ STATIC CONST ACPI_PARSER FacsParser[] = { This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -50,18 +50,18 @@ STATIC CONST ACPI_PARSER FacsParser[] = { VOID EFIAPI ParseAcpiFacs ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision ) { - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } ParseAcpi ( - Trace, + TRUE, 0, "FACS", Ptr, diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c index d86718bab67d45fd612bb7ac725b5eb3eeb7dfdc..8d0eb42ec3b361c1727184c542a757e39ef3da5c 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c @@ -1,7 +1,7 @@ /** @file FADT table parser - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -198,7 +198,7 @@ STATIC CONST ACPI_PARSER FadtParser[] = { This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -206,7 +206,7 @@ STATIC CONST ACPI_PARSER FadtParser[] = { VOID EFIAPI ParseAcpiFadt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -219,6 +219,9 @@ ParseAcpiFadt ( UINT32 FacsLength; UINT8 FacsRevision; PARSE_ACPI_TABLE_PROC FacsParserProc; + BOOLEAN Trace; + + Trace = IS_TRACE_FLAG_SET (ParseFlags); ParseAcpi ( Trace, @@ -253,7 +256,7 @@ ParseAcpiFadt ( // if HW_REDUCED_ACPI flag is not set, both FIRMWARE_CTRL and // X_FIRMWARE_CTRL cannot be zero, and the FACS Table must be // present. - if ((Trace) && + if (Trace && (Flags != NULL) && ((*Flags & EFI_ACPI_6_3_HW_REDUCED_ACPI) != EFI_ACPI_6_3_HW_REDUCED_ACPI)) { IncrementErrorCount (); @@ -274,11 +277,15 @@ ParseAcpiFadt ( // The FACS version is 1 byte starting at offset 32. FacsRevision = *(UINT8*)(FirmwareCtrlPtr + FACS_VERSION_OFFSET); - Trace = ProcessTableReportOptions ( - FacsSignature, - FirmwareCtrlPtr, - FacsLength - ); + if (ProcessTableReportOptions ( + FacsSignature, + FirmwareCtrlPtr, + FacsLength + )) { + ParseFlags |= PARSE_FLAGS_TRACE; + } else { + ParseFlags &= ~PARSE_FLAGS_TRACE; + } Status = GetParser (FacsSignature, &FacsParserProc); if (EFI_ERROR (Status)) { @@ -289,7 +296,7 @@ ParseAcpiFadt ( } FacsParserProc ( - Trace, + ParseFlags, FirmwareCtrlPtr, FacsLength, FacsRevision diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c index d02fc4929d6fa5e04672276810b19d3f4c62efd2..da93938771bfcf0da146fd46a025addeb05e71cc 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c @@ -1,7 +1,7 @@ /** @file GTDT table parser - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -254,7 +254,7 @@ DumpWatchdogTimer ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -262,7 +262,7 @@ DumpWatchdogTimer ( VOID EFIAPI ParseAcpiGtdt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -272,7 +272,7 @@ ParseAcpiGtdt ( UINT32 Offset; UINT8* TimerPtr; - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c index f7447947b2308d35d4d2890373778f0fd2f97f9e..2f659349499a02175820ee4faf3a84034c8ced76 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c @@ -1,7 +1,7 @@ /** @file IORT table parser - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -612,7 +612,7 @@ DumpIortNodePmcg ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -620,7 +620,7 @@ DumpIortNodePmcg ( VOID EFIAPI ParseAcpiIort ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -630,7 +630,7 @@ ParseAcpiIort ( UINT32 Index; UINT8* NodePtr; - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c index 15aa2392b60cee9e3843c7c560b0ab84e0be4174..a29bf97a3985a74ff888f225eb0e5cfbcbea72b0 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c @@ -1,7 +1,7 @@ /** @file MADT table parser - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -216,7 +216,7 @@ STATIC CONST ACPI_PARSER MadtInterruptControllerHeaderParser[] = { This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -224,7 +224,7 @@ STATIC CONST ACPI_PARSER MadtInterruptControllerHeaderParser[] = { VOID EFIAPI ParseAcpiMadt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -236,7 +236,7 @@ ParseAcpiMadt ( GICDCount = 0; - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Mcfg/McfgParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Mcfg/McfgParser.c index 9da4d60e849721ed3b635bfff8a3bd76728c0ade..febf8a2bd92d8e38bdc59a3f97a8c4485cdba5a5 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Mcfg/McfgParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Mcfg/McfgParser.c @@ -1,7 +1,7 @@ /** @file MCFG table parser - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -42,7 +42,7 @@ STATIC CONST ACPI_PARSER PciCfgSpaceBaseAddrParser[] = { This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -50,7 +50,7 @@ STATIC CONST ACPI_PARSER PciCfgSpaceBaseAddrParser[] = { VOID EFIAPI ParseAcpiMcfg ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -60,7 +60,7 @@ ParseAcpiMcfg ( UINT32 PciCfgOffset; UINT8* PciCfgSpacePtr; - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c index acd2b81bb3258c7322aa10d2c0e0d842d89e358b..538b6a69350d75ccbf36b86fff115255e77437c7 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -1,7 +1,7 @@ /** @file PPTT table parser - Copyright (c) 2019 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2019 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -241,13 +241,15 @@ STATIC CONST ACPI_PARSER IdStructureParser[] = { /** This function parses the Processor Hierarchy Node Structure (Type 0). - @param [in] Ptr Pointer to the start of the Processor Hierarchy Node - Structure data. - @param [in] Length Length of the Processor Hierarchy Node Structure. + @param [in] ParseFlags Flags describing what the parser needs to do. + @param [in] Ptr Pointer to the start of the Processor Hierarchy Node + Structure data. + @param [in] Length Length of the Processor Hierarchy Node Structure. **/ STATIC VOID DumpProcessorHierarchyNodeStructure ( + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT8 Length ) @@ -257,7 +259,7 @@ DumpProcessorHierarchyNodeStructure ( CHAR16 Buffer[OUTPUT_FIELD_COLUMN_WIDTH]; Offset = ParseAcpi ( - TRUE, + IS_TRACE_FLAG_SET (ParseFlags), 2, "Processor Hierarchy Node Structure", Ptr, @@ -315,18 +317,20 @@ DumpProcessorHierarchyNodeStructure ( /** This function parses the Cache Type Structure (Type 1). - @param [in] Ptr Pointer to the start of the Cache Type Structure data. - @param [in] Length Length of the Cache Type Structure. + @param [in] ParseFlags Flags describing what the parser needs to do. + @param [in] Ptr Pointer to the start of the Cache Type Structure data. + @param [in] Length Length of the Cache Type Structure. **/ STATIC VOID DumpCacheTypeStructure ( + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT8 Length ) { ParseAcpi ( - TRUE, + IS_TRACE_FLAG_SET (ParseFlags), 2, "Cache Type Structure", Ptr, @@ -338,18 +342,20 @@ DumpCacheTypeStructure ( /** This function parses the ID Structure (Type 2). - @param [in] Ptr Pointer to the start of the ID Structure data. - @param [in] Length Length of the ID Structure. + @param [in] ParseFlags Flags describing what the parser needs to do. + @param [in] Ptr Pointer to the start of the ID Structure data. + @param [in] Length Length of the ID Structure. **/ STATIC VOID DumpIDStructure ( + IN UINT8 ParseFlags, IN UINT8* Ptr, - IN UINT8 Length + IN UINT8 Length ) { ParseAcpi ( - TRUE, + IS_TRACE_FLAG_SET (ParseFlags), 2, "ID Structure", Ptr, @@ -370,7 +376,7 @@ DumpIDStructure ( This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -378,7 +384,7 @@ DumpIDStructure ( VOID EFIAPI ParseAcpiPptt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -387,12 +393,12 @@ ParseAcpiPptt ( UINT32 Offset; UINT8* ProcessorTopologyStructurePtr; - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } Offset = ParseAcpi ( - TRUE, + IS_TRACE_FLAG_SET (ParseFlags), 0, "PPTT", Ptr, @@ -440,24 +446,29 @@ ParseAcpiPptt ( return; } - PrintFieldName (2, L"* Structure Offset *"); - Print (L"0x%x\n", Offset); + if (IS_TRACE_FLAG_SET (ParseFlags)) { + PrintFieldName (2, L"* Structure Offset *"); + Print (L"0x%x\n", Offset); + } switch (*ProcessorTopologyStructureType) { case EFI_ACPI_6_2_PPTT_TYPE_PROCESSOR: DumpProcessorHierarchyNodeStructure ( + ParseFlags, ProcessorTopologyStructurePtr, *ProcessorTopologyStructureLength ); break; case EFI_ACPI_6_2_PPTT_TYPE_CACHE: DumpCacheTypeStructure ( + ParseFlags, ProcessorTopologyStructurePtr, *ProcessorTopologyStructureLength ); break; case EFI_ACPI_6_2_PPTT_TYPE_ID: DumpIDStructure ( + ParseFlags, ProcessorTopologyStructurePtr, *ProcessorTopologyStructureLength ); diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c index f4a8732a7db7c437031f2a3d2f266b80eff17b4b..c98bc62719c3aef3381152ff2436cb1a29f98362 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c @@ -1,7 +1,7 @@ /** @file RSDP table parser - Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -110,7 +110,7 @@ STATIC CONST ACPI_PARSER RsdpParser[] = { This function also performs a RAW dump of the ACPI table and validates the checksum. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -118,19 +118,19 @@ STATIC CONST ACPI_PARSER RsdpParser[] = { VOID EFIAPI ParseAcpiRsdp ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision ) { - if (Trace) { + if (IS_TRACE_FLAG_SET (ParseFlags)) { DumpRaw (Ptr, AcpiTableLength); VerifyChecksum (TRUE, Ptr, AcpiTableLength); } ParseAcpi ( - Trace, + IS_TRACE_FLAG_SET (ParseFlags), 0, "RSDP", Ptr, diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c index e4625ee8b13907893a9b6990ecb956baf91cc3b9..20d2fb79a8ea6251b0e31b5370cc400be9e1478f 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c @@ -1,7 +1,7 @@ /** @file SLIT table parser - Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -42,7 +42,7 @@ STATIC CONST ACPI_PARSER SlitParser[] = { - Relative distance from System Locality at i*N+j is same as j*N+i - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -50,7 +50,7 @@ STATIC CONST ACPI_PARSER SlitParser[] = { VOID EFIAPI ParseAcpiSlit ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -63,7 +63,7 @@ ParseAcpiSlit ( UINT8* LocalityPtr; CHAR16 Buffer[80]; // Used for AsciiName param of ParseAcpi - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c index 3b06b05dee8c056c6e009b9e485ccd35d4194e95..99cffafa946979b79a06cd28f14257beaa6cafec 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c @@ -1,7 +1,7 @@ /** @file SPCR table parser - Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -114,7 +114,7 @@ STATIC CONST ACPI_PARSER SpcrParser[] = { This function also performs validations of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -122,13 +122,13 @@ STATIC CONST ACPI_PARSER SpcrParser[] = { VOID EFIAPI ParseAcpiSpcr ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision ) { - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c index b9b67820b89f7fc5560a1022e976663db7d9df2d..907856368fbe0ad9f140d8f27e51bd9460f35b1a 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c @@ -1,7 +1,7 @@ /** @file SRAT table parser - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -344,7 +344,7 @@ STATIC CONST ACPI_PARSER SratX2ApciAffinityParser[] = { This function also performs validation of the ACPI table fields. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -352,7 +352,7 @@ STATIC CONST ACPI_PARSER SratX2ApciAffinityParser[] = { VOID EFIAPI ParseAcpiSrat ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -375,7 +375,7 @@ ParseAcpiSrat ( ApicSapicAffinityIndex = 0; X2ApicAffinityIndex = 0; - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ssdt/SsdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ssdt/SsdtParser.c index f18664b8a6879b82dc9c55d9979ca21e01c4fc99..138a3159fb1a6121387f832621d23960c688ce30 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ssdt/SsdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ssdt/SsdtParser.c @@ -1,7 +1,7 @@ /** @file SSDT table parser - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -20,7 +20,7 @@ For the SSDT table only the ACPI header fields are parsed and traced. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -28,13 +28,13 @@ VOID EFIAPI ParseAcpiSsdt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision ) { - if (!Trace) { + if (!IS_TRACE_FLAG_SET (ParseFlags)) { return; } diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c index e39061f8e2612f2cce4aebf51a511b63b703662b..bbd58d72ad9c676b4843d3b4f1d7c554a5abbd3f 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c @@ -1,7 +1,7 @@ /** @file XSDT table parser - Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -40,7 +40,7 @@ GetAcpiXsdtHeaderInfo ( This function also performs validation of the XSDT table. - @param [in] Trace If TRUE, trace the ACPI fields. + @param [in] ParseFlags Flags describing what the parser needs to do. @param [in] Ptr Pointer to the start of the buffer. @param [in] AcpiTableLength Length of the ACPI table. @param [in] AcpiTableRevision Revision of the ACPI table. @@ -48,7 +48,7 @@ GetAcpiXsdtHeaderInfo ( VOID EFIAPI ParseAcpiXsdt ( - IN BOOLEAN Trace, + IN UINT8 ParseFlags, IN UINT8* Ptr, IN UINT32 AcpiTableLength, IN UINT8 AcpiTableRevision @@ -61,7 +61,7 @@ ParseAcpiXsdt ( CHAR16 Buffer[32]; Offset = ParseAcpi ( - Trace, + IS_TRACE_FLAG_SET (ParseFlags), 0, "XSDT", Ptr, @@ -71,7 +71,7 @@ ParseAcpiXsdt ( TableOffset = Offset; - if (Trace) { + if (IS_TRACE_FLAG_SET (ParseFlags)) { EntryIndex = 0; TablePointer = (UINT64*)(Ptr + TableOffset); while (Offset < AcpiTableLength) { -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")