UEFI231 spec compliance:

UEFI231 defines EFI_SMM_COMMUNICATION_ACPI_TABLE. We should move it from Pi/ dir to Uefi/ dir.
UEFI231 defines EFI_SMM_COMMUNICATE_HEADER. We should move it from Protocol/SmmCommunication.h to Uefi/ dir.
The original file will still include the new data structure to keep compatibility.

signed-off-by: jyao1
reviewed-by: rsun3

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12724 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h b/MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h
index 78d801aa7153ad60e3a4f583a4bf2a915be7404f..979aa9b316ecce1d6bb949a21ae90412bbb1b712 100644 (file)
--- a/MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h
+++ b/MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h
@@ -17,12 +17,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <Uefi/UefiAcpiDataTable.h>\r
 \r
-#pragma pack(1)\r
-typedef struct {\r
-  EFI_ACPI_DATA_TABLE  UefiAcpiDataTable;\r
-  UINT32               SwSmiNumber;\r
-  UINT64               BufferPtrAddress;\r
-} EFI_SMM_COMMUNICATION_ACPI_TABLE;\r
-#pragma pack()\r
-\r
 #endif\r

diff --git a/MdePkg/Include/Protocol/SmmCommunication.h b/MdePkg/Include/Protocol/SmmCommunication.h
index ba2eca3c4c6eefda99f2560752fac601ca4b7e05..c284e55b24a819155cdca570a9bc87c2b29f6e74 100644 (file)
--- a/MdePkg/Include/Protocol/SmmCommunication.h
+++ b/MdePkg/Include/Protocol/SmmCommunication.h
@@ -4,7 +4,7 @@
   This protocol provides a means of communicating between drivers outside of SMM and SMI \r
   handlers inside of SMM.  \r
 \r
-  Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2011, 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
@@ -18,30 +18,16 @@
 #ifndef _SMM_COMMUNICATION_H_\r
 #define _SMM_COMMUNICATION_H_\r
 \r
+//\r
+// Need include this header file for EFI_SMM_COMMUNICATE_HEADER data structure.\r
+//\r
+#include <Uefi/UefiAcpiDataTable.h>\r
+\r
 #define EFI_SMM_COMMUNICATION_PROTOCOL_GUID \\r
   { \\r
     0xc68ed8e2, 0x9dc6, 0x4cbd, { 0x9d, 0x94, 0xdb, 0x65, 0xac, 0xc5, 0xc3, 0x32 } \\r
   }\r
 \r
-///\r
-/// To avoid confusion in interpreting frames, the communication buffer should always \r
-/// begin with EFI_SMM_COMMUNICATE_HEADER\r
-///\r
-typedef struct {\r
-  ///\r
-  /// Allows for disambiguation of the message format.\r
-  ///\r
-  EFI_GUID  HeaderGuid;\r
-  ///\r
-  /// Describes the size of Data (in bytes) and does not include the size of the header.\r
-  ///\r
-  UINTN     MessageLength;\r
-  ///\r
-  /// Designates an array of bytes that is MessageLength in size.\r
-  ///\r
-  UINT8     Data[1];\r
-} EFI_SMM_COMMUNICATE_HEADER;\r
-\r
 typedef struct _EFI_SMM_COMMUNICATION_PROTOCOL  EFI_SMM_COMMUNICATION_PROTOCOL;\r
 \r
 /**\r

diff --git a/MdePkg/Include/Uefi/UefiAcpiDataTable.h b/MdePkg/Include/Uefi/UefiAcpiDataTable.h
index d0245fca877094d95982e750a223d2205dc8f767..30a53559fd338c72a9ef2ef743d5ae90862758b7 100644 (file)
--- a/MdePkg/Include/Uefi/UefiAcpiDataTable.h
+++ b/MdePkg/Include/Uefi/UefiAcpiDataTable.h
@@ -23,6 +23,32 @@ typedef struct {
   GUID                          Identifier;\r
   UINT16                        DataOffset;\r
 } EFI_ACPI_DATA_TABLE;\r
+\r
+typedef struct {\r
+  EFI_ACPI_DATA_TABLE  UefiAcpiDataTable;\r
+  UINT32               SwSmiNumber;\r
+  UINT64               BufferPtrAddress;\r
+} EFI_SMM_COMMUNICATION_ACPI_TABLE;\r
+\r
+///\r
+/// To avoid confusion in interpreting frames, the communication buffer should always \r
+/// begin with EFI_SMM_COMMUNICATE_HEADER\r
+///\r
+typedef struct {\r
+  ///\r
+  /// Allows for disambiguation of the message format.\r
+  ///\r
+  EFI_GUID  HeaderGuid;\r
+  ///\r
+  /// Describes the size of Data (in bytes) and does not include the size of the header.\r
+  ///\r
+  UINTN     MessageLength;\r
+  ///\r
+  /// Designates an array of bytes that is MessageLength in size.\r
+  ///\r
+  UINT8     Data[1];\r
+} EFI_SMM_COMMUNICATE_HEADER;\r
+\r
 #pragma pack()\r
 \r
 #endif\r