UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / WatchdogResourceTable.h

diff --git a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
index d1dba4f4798b377d00fc040a916c6b88ead8d97e..88ebd6d0ed2c6d6a46e73b41f058569d3233f3a5 100644 (file)
--- a/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
+++ b/MdePkg/Include/IndustryStandard/WatchdogResourceTable.h
@@ -1,15 +1,9 @@
-/** @file   \r
+/** @file\r
   ACPI Watchdog Resource Table (WDRT) as defined at\r
   Microsoft Windows Hardware Developer Central.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
 #ifndef _WATCHDOG_RESOURCE_TABLE_H_\r
@@ -17,23 +11,30 @@
 \r
 #include <IndustryStandard/Acpi.h>\r
 \r
+//\r
+// Ensure proper structure formats\r
+//\r
+#pragma pack(1)\r
+\r
 ///\r
 /// Watchdog Resource Table definition.\r
 ///\r
 typedef struct {\r
-  EFI_ACPI_DESCRIPTION_HEADER             Header;\r
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  ControlRegisterAddress;\r
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  CountRegisterAddress;\r
-  UINT16                                  PCIDeviceID;\r
-  UINT16                                  PCIVendorID;\r
-  UINT8                                   PCIBusNumber;\r
-  UINT8                                   PCIDeviceNumber;\r
-  UINT8                                   PCIFunctionNumber;\r
-  UINT8                                   PCISegment;\r
-  UINT16                                  MaxCount;\r
-  UINT8                                   Units;\r
+  EFI_ACPI_DESCRIPTION_HEADER               Header;\r
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    ControlRegisterAddress;\r
+  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE    CountRegisterAddress;\r
+  UINT16                                    PCIDeviceID;\r
+  UINT16                                    PCIVendorID;\r
+  UINT8                                     PCIBusNumber;\r
+  UINT8                                     PCIDeviceNumber;\r
+  UINT8                                     PCIFunctionNumber;\r
+  UINT8                                     PCISegment;\r
+  UINT16                                    MaxCount;\r
+  UINT8                                     Units;\r
 } EFI_ACPI_WATCHDOG_RESOURCE_1_0_TABLE;\r
 \r
+#pragma pack()\r
+\r
 //\r
 // WDRT Revision (defined in spec)\r
 //\r
@@ -42,8 +43,8 @@ typedef struct {
 //\r
 // WDRT 1.0 Count Unit\r
 //\r
-#define EFI_ACPI_WDRT_1_0_COUNT_UNIT_1_SEC_PER_COUNT        1\r
-#define EFI_ACPI_WDRT_1_0_COUNT_UNIT_100_MILLISEC_PER_COUNT 2\r
-#define EFI_ACPI_WDRT_1_0_COUNT_UNIT_10_MILLISEC_PER_COUNT  3\r
+#define EFI_ACPI_WDRT_1_0_COUNT_UNIT_1_SEC_PER_COUNT         1\r
+#define EFI_ACPI_WDRT_1_0_COUNT_UNIT_100_MILLISEC_PER_COUNT  2\r
+#define EFI_ACPI_WDRT_1_0_COUNT_UNIT_10_MILLISEC_PER_COUNT   3\r
 \r
 #endif\r