MdePkg : Update SPCR to use ACPI5 definition

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

diff --git a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
index 74ea5b3f96135e5c3ceafcf98f5184309f6fe2cf..d57518d5db9908eeb07b88d0c2c9d854904e56c7 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
+++ b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
@@ -2,7 +2,8 @@
   ACPI Serial Port Console Redirection Table as defined by Microsoft in\r
   http://www.microsoft.com/whdc/system/platform/server/spcr.mspx\r
     \r
-  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@@ -26,7 +27,7 @@
 ///\r
 /// SPCR Revision (defined in spec)\r
 ///\r
-#define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION 0x01\r
+#define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION 0x02\r
 \r
 ///\r
 /// Serial Port Console Redirection Table Format\r
@@ -35,7 +36,7 @@ typedef struct {
   EFI_ACPI_DESCRIPTION_HEADER             Header;\r
   UINT8                                   InterfaceType;\r
   UINT8                                   Reserved1[3];\r
-  EFI_ACPI_2_0_GENERIC_ADDRESS_STRUCTURE  BaseAddress;\r
+  EFI_ACPI_5_0_GENERIC_ADDRESS_STRUCTURE  BaseAddress;\r
   UINT8                                   InterruptType;\r
   UINT8                                   Irq;\r
   UINT32                                  GlobalSystemInterrupt;\r
@@ -44,7 +45,7 @@ typedef struct {
   UINT8                                   StopBits;\r
   UINT8                                   FlowControl;\r
   UINT8                                   TerminalType;\r
-  UINT8                                   Language;\r
+  UINT8                                   Reserved2;\r
   UINT16                                  PciDeviceId;\r
   UINT16                                  PciVendorId;\r
   UINT8                                   PciBusNumber;\r
@@ -52,7 +53,7 @@ typedef struct {
   UINT8                                   PciFunctionNumber;\r
   UINT32                                  PciFlags;\r
   UINT8                                   PciSegment;\r
-  UINT32                                  Reserved2;\r
+  UINT32                                  Reserved3;\r
 } EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE;\r
 \r
 #pragma pack()\r
@@ -90,6 +91,10 @@ typedef struct {
 /// I/O SAPIC interrupt (Global System Interrupt)\r
 ///\r
 #define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_SAPIC   0x4\r
+///\r
+/// ARMH GIC interrupt (Global System Interrupt)\r
+///\r
+#define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC     0x8\r
 \r
 //\r
 // Baud Rate\r