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>

diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/IndustryStandard/Acpi64.h
index c905db93fabb6faa553dd49a9fed886437dd4daf..3a91302f8c0e71d4951d27aac35322073219c836 100644 (file)
--- 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;\r
 \r
 ///\r
-/// Generic Initiator Affinity Structure\r
+/// Device Handle\r
 ///\r
-typedef struct {\r
-  UINT8   Type;\r
-  UINT8   Length;\r
-  UINT8   Reserved1;\r
-  UINT8   DeviceHandleType;\r
-  UINT32  ProximityDomain;\r
-\r
-  union {\r
+typedef union {\r
     EFI_ACPI_6_4_DEVICE_HANDLE_ACPI   Acpi;\r
     EFI_ACPI_6_4_DEVICE_HANDLE_PCI    Pci;\r
-  } DeviceHandle;\r
+} EFI_ACPI_6_4_DEVICE_HANDLE;\r
 \r
-  UINT32  Flags;\r
-  UINT8   Reserved2[4];\r
+///\r
+/// Generic Initiator Affinity Structure\r
+///\r
+typedef struct {\r
+  UINT8                       Type;\r
+  UINT8                       Length;\r
+  UINT8                       Reserved1;\r
+  UINT8                       DeviceHandleType;\r
+  UINT32                      ProximityDomain;\r
+  EFI_ACPI_6_4_DEVICE_HANDLE  DeviceHandle;\r
+  UINT32                      Flags;\r
+  UINT8                       Reserved2[4];\r
 } EFI_ACPI_6_4_GENERIC_INITIATOR_AFFINITY_STRUCTURE;\r
 \r
 ///\r

diff --git a/MdePkg/MdePkg.ci.yaml b/MdePkg/MdePkg.ci.yaml
index 15931eaccabff7334a8b839c438d4d9a907b4194..98eaea1c824863a89bf2e73b8312fe89881fb3c1 100644 (file)
--- a/MdePkg/MdePkg.ci.yaml
+++ b/MdePkg/MdePkg.ci.yaml
@@ -3,6 +3,7 @@
 #\r
 # Copyright (c) Microsoft Corporation\r
 # Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2021, Arm Limited. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ##\r
 {\r
@@ -19,6 +20,7 @@
         ],\r
         ## Both file path and directory path are accepted.\r
         "IgnoreFiles": [\r
+            "Include/IndustryStandard/Acpi64.h"\r
         ]\r
     },\r
     ## options defined ci/Plugin/CompilerPlugin\r