MdePkg: Replace BSD License with BSD+Patent License

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

diff --git a/MdePkg/Include/IndustryStandard/Acpi51.h b/MdePkg/Include/IndustryStandard/Acpi51.h
index 06aa71403fabd8e73f34814f08f6f7e1ace39faf..e80b93f49a6af35bcde60fb8d82349731df494a1 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi51.h
+++ b/MdePkg/Include/IndustryStandard/Acpi51.h
@@ -1,14 +1,10 @@
-/** @file   \r
-  ACPI 5.1 definitions from the ACPI Specification Revision 5.1 July, 2014.\r
+/** @file\r
+  ACPI 5.1 definitions from the ACPI Specification Revision 5.1 Errata B January, 2016.\r
 \r
-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
-  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) 2014 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
 #ifndef _ACPI_5_1_H_\r
@@ -87,7 +83,7 @@ typedef struct {
 \r
 //\r
 // Root System Description Table\r
-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT32 table pointers.\r
 //\r
 \r
@@ -98,7 +94,7 @@ typedef struct {
 \r
 //\r
 // Extended System Description Table\r
-// No definition needed as it is a common description table header, the same with \r
+// No definition needed as it is a common description table header, the same with\r
 // EFI_ACPI_DESCRIPTION_HEADER, followed by a variable number of UINT64 table pointers.\r
 //\r
 \r
@@ -528,9 +524,18 @@ typedef struct {
   UINT32  GicId;\r
   UINT64  PhysicalBaseAddress;\r
   UINT32  SystemVectorBase;\r
-  UINT32  Reserved2;\r
+  UINT8   GicVersion;\r
+  UINT8   Reserved2[3];\r
 } EFI_ACPI_5_1_GIC_DISTRIBUTOR_STRUCTURE;\r
 \r
+///\r
+/// GIC Version\r
+///\r
+#define EFI_ACPI_5_1_GIC_V1                                   0x01\r
+#define EFI_ACPI_5_1_GIC_V2                                   0x02\r
+#define EFI_ACPI_5_1_GIC_V3                                   0x03\r
+#define EFI_ACPI_5_1_GIC_V4                                   0x04\r
+\r
 ///\r
 /// GIC MSI Frame Structure\r
 ///\r
@@ -1256,7 +1261,7 @@ typedef struct {
 ///\r
 /// GTDT Version (as defined in ACPI 5.1 spec.)\r
 ///\r
-#define EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION 0x01\r
+#define EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION 0x02\r
 \r
 ///\r
 /// Timer Flags.  All other bits are reserved and must be 0.\r
@@ -1863,7 +1868,8 @@ typedef struct {
   UINT8                                    CommandComplete:1;\r
   UINT8                                    SciDoorbell:1;\r
   UINT8                                    Error:1;\r
-  UINT8                                    Reserved:5;\r
+  UINT8                                    PlatformNotification:1;\r
+  UINT8                                    Reserved:4;\r
   UINT8                                    Reserved1;\r
 } EFI_ACPI_5_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;\r
 \r
@@ -1880,7 +1886,7 @@ typedef struct {
 ///\r
 /// "RSD PTR " Root System Description Pointer\r
 ///\r
-#define EFI_ACPI_5_1_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ') \r
+#define EFI_ACPI_5_1_ROOT_SYSTEM_DESCRIPTION_POINTER_SIGNATURE  SIGNATURE_64('R', 'S', 'D', ' ', 'P', 'T', 'R', ' ')\r
 \r
 ///\r
 /// "APIC" Multiple APIC Description Table\r