Remove duplicated definition of EFI_SMM_COMMUNICATE_HEADER in PI and Framework SMM.

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

1 files changed, 7 insertions, 19 deletions

diff --git a/edk2/IntelFrameworkPkg/Include/Protocol/SmmBase.h b/edk2/IntelFrameworkPkg/Include/Protocol/SmmBase.h
index 0f82dce7e..65d097949 100644
--- a/edk2/IntelFrameworkPkg/Include/Protocol/SmmBase.h
+++ b/edk2/IntelFrameworkPkg/Include/Protocol/SmmBase.h
@@ -37,6 +37,12 @@
 #ifndef _SMM_BASE_H_

 #define _SMM_BASE_H_

 

+//

+// Share some common definitions with PI SMM

+//

+#include <Framework/SmmCis.h>

+#include <Protocol/SmmCommunication.h>

+

 ///

 /// Global ID for the EFI_SMM_BASE_PROTOCOL

 ///

@@ -60,24 +66,6 @@ typedef struct _EFI_SMM_BASE_PROTOCOL  EFI_SMM_BASE_PROTOCOL;
 #define EFI_HANDLER_SOURCE_PENDING  0x0003

 ///@}

 

-///

-/// The header data is mandatory for messages sent into the SMM agent.

-///

-typedef struct {

-  ///

-  /// Allows for disambiguation of the message format.

-  ///

-  EFI_GUID                         HeaderGuid;

-  ///

-  /// Describes the size of the message, not including the header.

-  ///

-  UINTN                            MessageLength;

-  ///

-  /// Designates an array of bytes that is MessageLength in size.

-  ///

-  UINT8                            Data[1];

-} EFI_SMM_COMMUNICATE_HEADER;

-

 /**

   Entry Point to Callback service

 

@@ -127,7 +115,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_SMM_REGISTER_HANDLER)(

-  IN EFI_SMM_BASE_PROTOCOL                           *This,

+  IN  EFI_SMM_BASE_PROTOCOL                          *This,

   IN  EFI_DEVICE_PATH_PROTOCOL                       *FilePath,

   IN  VOID                                           *SourceBuffer OPTIONAL,

   IN  UINTN                                          SourceSize,