diff options
author | davidhuang <davidhuang@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-12-17 07:59:09 +0000 |
---|---|---|
committer | davidhuang <davidhuang@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-12-17 07:59:09 +0000 |
commit | d64527e50d40077d160ea44b1394b33f7490aa6b (patch) | |
tree | b800f20764981b8943736d4fa4295575d5138681 | |
parent | 43e332071d019ce155431a153cf5cd72ab48afac (diff) | |
download | edk2-d64527e50d40077d160ea44b1394b33f7490aa6b.zip edk2-d64527e50d40077d160ea44b1394b33f7490aa6b.tar.gz edk2-d64527e50d40077d160ea44b1394b33f7490aa6b.tar.bz2 |
To avoid naming conflicts between PI SMMBASE2 Protocol/FRAMEWORK SMM Base Protocol
1. Change PI definition EFI_SMM_COMMUNICATE to EFI_SMM_COMMUNICATE2
2. Change PI definition EFI_SMM_INSIDE_OUT to EFI_SMM_INSIDE_OUT2
3. Change PI definition EFI_SMM_GET_SMST_LOCATION to EFI_SMM_GET_SMST_LOCATION2
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9575 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r-- | MdePkg/Include/Protocol/SmmBase2.h | 8 | ||||
-rw-r--r-- | MdePkg/Include/Protocol/SmmCommunication.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/MdePkg/Include/Protocol/SmmBase2.h b/MdePkg/Include/Protocol/SmmBase2.h index 4f98618..262d533 100644 --- a/MdePkg/Include/Protocol/SmmBase2.h +++ b/MdePkg/Include/Protocol/SmmBase2.h @@ -44,7 +44,7 @@ typedef struct _EFI_SMM_BASE2_PROTOCOL EFI_SMM_BASE2_PROTOCOL; **/
typedef
EFI_STATUS
-(EFIAPI *EFI_SMM_INSIDE_OUT)(
+(EFIAPI *EFI_SMM_INSIDE_OUT2)(
IN CONST EFI_SMM_BASE2_PROTOCOL *This,
OUT BOOLEAN *InSmram
)
@@ -66,7 +66,7 @@ EFI_STATUS **/
typedef
EFI_STATUS
-(EFIAPI *EFI_SMM_GET_SMST_LOCATION)(
+(EFIAPI *EFI_SMM_GET_SMST_LOCATION2)(
IN CONST EFI_SMM_BASE2_PROTOCOL *This,
IN OUT EFI_SMM_SYSTEM_TABLE2 **Smst
)
@@ -77,8 +77,8 @@ EFI_STATUS /// services and determine whether the driver is being invoked inside SMRAM or outside of SMRAM.
///
struct _EFI_SMM_BASE2_PROTOCOL {
- EFI_SMM_INSIDE_OUT InSmm;
- EFI_SMM_GET_SMST_LOCATION GetSmstLocation;
+ EFI_SMM_INSIDE_OUT2 InSmm;
+ EFI_SMM_GET_SMST_LOCATION2 GetSmstLocation;
};
extern EFI_GUID gEfiSmmBase2ProtocolGuid;
diff --git a/MdePkg/Include/Protocol/SmmCommunication.h b/MdePkg/Include/Protocol/SmmCommunication.h index f2cbecf..018aba7 100644 --- a/MdePkg/Include/Protocol/SmmCommunication.h +++ b/MdePkg/Include/Protocol/SmmCommunication.h @@ -59,7 +59,7 @@ typedef struct _EFI_SMM_COMMUNICATION_PROTOCOL EFI_SMM_COMMUNICATION_PROTOCOL; **/
typedef
EFI_STATUS
-(EFIAPI *EFI_SMM_COMMUNICATE)(
+(EFIAPI *EFI_SMM_COMMUNICATE2)(
IN CONST EFI_SMM_COMMUNICATION_PROTOCOL *This,
IN OUT VOID *CommBuffer,
IN OUT UINTN *CommSize
@@ -70,7 +70,7 @@ EFI_STATUS /// between DXE drivers and a registered SMI handler.
///
struct _EFI_SMM_COMMUNICATION_PROTOCOL {
- EFI_SMM_COMMUNICATE Communicate;
+ EFI_SMM_COMMUNICATE2 Communicate;
};
extern EFI_GUID gEfiSmmCommunicationProtocolGuid;
|