From c374aa43a199a5aab53218ef3cf99284ba19ae98 Mon Sep 17 00:00:00 2001
From: Heyi Guo <heyi.guo@linaro.org>
Date: Fri, 13 Nov 2015 03:27:54 +0000
Subject: [PATCH] Update SPCR table definition per SPCR specification v1.03.

Document link:
http://msdn.microsoft.com/en-us/library/windows/hardware/dn639132(v=vs.85).aspx

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Heyi Guo" <heyi.guo@linaro.org>
Reviewed-by: "Jiewen Yao" <jiewen.yao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18782 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../SerialPortConsoleRedirectionTable.h              | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
index 74ea5b3f96..bf295050df 100644
--- a/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
+++ b/MdePkg/Include/IndustryStandard/SerialPortConsoleRedirectionTable.h
@@ -2,7 +2,7 @@
   ACPI Serial Port Console Redirection Table as defined by Microsoft in
   http://www.microsoft.com/whdc/system/platform/server/spcr.mspx
     
-  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
   which accompanies this distribution.  The full text of the license may be found at        
@@ -26,7 +26,7 @@
 ///
 /// SPCR Revision (defined in spec)
 ///
-#define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION 0x01
+#define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION 0x02
 
 ///
 /// Serial Port Console Redirection Table Format
@@ -44,7 +44,7 @@ typedef struct {
   UINT8                                   StopBits;
   UINT8                                   FlowControl;
   UINT8                                   TerminalType;
-  UINT8                                   Language;
+  UINT8                                   Reserved2;
   UINT16                                  PciDeviceId;
   UINT16                                  PciVendorId;
   UINT8                                   PciBusNumber;
@@ -52,7 +52,7 @@ typedef struct {
   UINT8                                   PciFunctionNumber;
   UINT32                                  PciFlags;
   UINT8                                   PciSegment;
-  UINT32                                  Reserved2;
+  UINT32                                  Reserved3;
 } EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE;
 
 #pragma pack()
@@ -90,6 +90,10 @@ typedef struct {
 /// I/O SAPIC interrupt (Global System Interrupt)
 ///
 #define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_SAPIC   0x4
+///
+/// ARMH GIC interrupt (Global System Interrupt)
+///
+#define EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC     0x8
 
 //
 // Baud Rate
-- 
2.39.2