summaryrefslogtreecommitdiffstats
path: root/MdePkg
diff options
context:
space:
mode:
authorChris Jones <christopher.jones@arm.com>2021-07-29 11:10:24 +0100
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-08-11 01:53:28 +0000
commit3d359ff90571704b53f19bf95aa797337c041abc (patch)
tree3fc115e2c61228c0096636986d8c0800ab6b83f5 /MdePkg
parent605c4a1ff2e0033002652c2315b3bf6f40bec0cf (diff)
downloadedk2-3d359ff90571704b53f19bf95aa797337c041abc.tar.gz
edk2-3d359ff90571704b53f19bf95aa797337c041abc.tar.bz2
edk2-3d359ff90571704b53f19bf95aa797337c041abc.zip
MdePkg: Fix broken coding style in Acpi64.h
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> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Diffstat (limited to 'MdePkg')
-rw-r--r--MdePkg/Include/IndustryStandard/Acpi64.h27
-rw-r--r--MdePkg/MdePkg.ci.yaml2
2 files changed, 17 insertions, 12 deletions
diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/IndustryStandard/Acpi64.h
index c905db93fa..3a91302f8c 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 15931eacca..98eaea1c82 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