From: "Chris Jones" <christopher.jones@arm.com>
To: <devel@edk2.groups.io>
Cc: Sami Mujawar <Sami.Mujawar@arm.com>,
Akanksha Jain <Akanksha.Jain2@arm.com>,
Ben Adderson <Ben.Adderson@arm.com>,
Michael Kinney <michael.d.kinney@intel.com>,
<gaoliming@byosoft.com.cn>, <zhiguang.liu@intel.com>,
Leif Lindholm <leif.lindholm@linaro.org>,
"Matteo Carlini" <Matteo.Carlini@arm.com>, <nd@arm.com>
Subject: [PATCH v2 13/13] MdePkg: Fix broken coding style in Acpi64.h
Date: Thu, 5 Aug 2021 17:25:22 +0100 [thread overview]
Message-ID: <20210805162522.13201-14-christopher.jones@arm.com> (raw)
In-Reply-To: <20210805162522.13201-1-christopher.jones@arm.com>
Bugzilla: 3516 (https://bugzilla.tianocore.org/show_bug.cgi?id=3516)
Fix a coding style issue raised by EccCheck. This issue (error code
7008) has been fixed by moving a nested union out of its structure.
Also add Acpi64.h to the "IgnoreFiles" list to stop the CI flagging
naming errors present prior to ACPI 64.
Signed-off-by: Chris Jones <christopher.jones@arm.com>
---
Notes:
v2:
- Remove EFI_ACPI_6_4_GIC_STRUCTURE field name changes. [Liming]
- Add Acpi64.h to IgnoreFiles list in MdePkg.ci.yaml. [Liming]
MdePkg/Include/IndustryStandard/Acpi64.h | 27 +++++++++++---------
MdePkg/MdePkg.ci.yaml | 2 ++
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/IndustryStandard/Acpi64.h
index c905db93fabb6faa553dd49a9fed886437dd4daf..3a91302f8c0e71d4951d27aac35322073219c836 100644
--- a/MdePkg/Include/IndustryStandard/Acpi64.h
+++ b/MdePkg/Include/IndustryStandard/Acpi64.h
@@ -788,22 +788,25 @@ typedef struct {
} EFI_ACPI_6_4_DEVICE_HANDLE_PCI;
///
-/// Generic Initiator Affinity Structure
+/// Device Handle
///
-typedef struct {
- UINT8 Type;
- UINT8 Length;
- UINT8 Reserved1;
- UINT8 DeviceHandleType;
- UINT32 ProximityDomain;
-
- union {
+typedef union {
EFI_ACPI_6_4_DEVICE_HANDLE_ACPI Acpi;
EFI_ACPI_6_4_DEVICE_HANDLE_PCI Pci;
- } DeviceHandle;
+} EFI_ACPI_6_4_DEVICE_HANDLE;
- UINT32 Flags;
- UINT8 Reserved2[4];
+///
+/// Generic Initiator Affinity Structure
+///
+typedef struct {
+ UINT8 Type;
+ UINT8 Length;
+ UINT8 Reserved1;
+ UINT8 DeviceHandleType;
+ UINT32 ProximityDomain;
+ EFI_ACPI_6_4_DEVICE_HANDLE DeviceHandle;
+ UINT32 Flags;
+ UINT8 Reserved2[4];
} EFI_ACPI_6_4_GENERIC_INITIATOR_AFFINITY_STRUCTURE;
///
diff --git a/MdePkg/MdePkg.ci.yaml b/MdePkg/MdePkg.ci.yaml
index 15931eaccabff7334a8b839c438d4d9a907b4194..98eaea1c824863a89bf2e73b8312fe89881fb3c1 100644
--- a/MdePkg/MdePkg.ci.yaml
+++ b/MdePkg/MdePkg.ci.yaml
@@ -3,6 +3,7 @@
#
# Copyright (c) Microsoft Corporation
# Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2021, Arm Limited. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
##
{
@@ -19,6 +20,7 @@
],
## Both file path and directory path are accepted.
"IgnoreFiles": [
+ "Include/IndustryStandard/Acpi64.h"
]
},
## options defined ci/Plugin/CompilerPlugin
--
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
next prev parent reply other threads:[~2021-08-05 16:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-05 16:25 [PATCH v2 00/13] Add ACPI 6.4 header file Chris Jones
2021-08-05 16:25 ` [PATCH v2 01/13] MdePkg: " Chris Jones
2021-08-05 16:25 ` [PATCH v2 02/13] MdePkg: Increment FADT version Chris Jones
2021-08-05 16:25 ` [PATCH v2 03/13] MdePkg: Rename SBSA Generic Watchdog to Arm Generic Watchdog Chris Jones
2021-08-05 16:25 ` [PATCH v2 04/13] MdePkg: Update PMTT to ACPI 6.4 Chris Jones
2021-08-05 16:25 ` [PATCH v2 05/13] MdePkg: Add SPA Location Cookie field to SPA Range structure Chris Jones
2021-08-05 16:25 ` [PATCH v2 06/13] MdePkg: Remove DPPT table Chris Jones
2021-08-05 16:25 ` [PATCH v2 07/13] MdePkg: Add flags and MinTransferSize to Generic Initiator Chris Jones
2021-08-05 16:25 ` [PATCH v2 08/13] MdePkg: Add 'Type 5' PCC structure Chris Jones
2021-08-05 16:25 ` [PATCH v2 09/13] MdePkg: Add Multiprocessor Wakeup structure Chris Jones
2021-08-05 16:25 ` [PATCH v2 10/13] MdePkg: Add the Platform Health Assessment Table (PHAT) Chris Jones
2021-08-05 16:25 ` [PATCH v2 11/13] MdePkg: Add Secure Access Components in the SDEV table Chris Jones
2021-08-05 16:25 ` [PATCH v2 12/13] MdePkg: Add Cache ID to PPTT Chris Jones
2021-08-05 16:25 ` Chris Jones [this message]
2021-08-06 1:28 ` 回复: [edk2-devel] [PATCH v2 00/13] Add ACPI 6.4 header file gaoliming
2021-08-06 8:19 ` Sami Mujawar
2021-08-11 1:27 ` 回复: [edk2-devel] " gaoliming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210805162522.13201-14-christopher.jones@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox