MdePkg/BaseLib.h: Rollback field name changes

[mirror_edk2.git] / MdePkg / Include / Protocol / SmmBase2.h

diff --git a/MdePkg/Include/Protocol/SmmBase2.h b/MdePkg/Include/Protocol/SmmBase2.h
index dc1b21877414ec07af4c2a49f392647fe7d67f3c..0033e4e13faff9aea2470c34bfa11c21d5776aae 100644 (file)
--- a/MdePkg/Include/Protocol/SmmBase2.h
+++ b/MdePkg/Include/Protocol/SmmBase2.h
@@ -4,8 +4,8 @@
   This protocol is utilized by all SMM drivers to locate the SMM infrastructure services and determine\r
   whether the driver is being invoked inside SMRAM or outside of SMRAM.\r
 \r
-  Copyright (c) 2009, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
+  Copyright (c) 2009 - 2017, 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
   http://opensource.org/licenses/bsd-license.php                                            \r
@@ -19,11 +19,9 @@
 #define _SMM_BASE2_H_\r
 \r
 #include <Pi/PiSmmCis.h>\r
+#include <Protocol/MmBase.h>\r
 \r
-#define EFI_SMM_BASE2_PROTOCOL_GUID \\r
-  { \\r
-    0xf4ccbfb7, 0xf6e0, 0x47fd, {0x9d, 0xd4, 0x10, 0xa8, 0xf1, 0x50, 0xc1, 0x91 }  \\r
-  }\r
+#define EFI_SMM_BASE2_PROTOCOL_GUID  EFI_MM_BASE_PROTOCOL_GUID\r
 \r
 typedef struct _EFI_SMM_BASE2_PROTOCOL  EFI_SMM_BASE2_PROTOCOL;\r
 \r
@@ -44,7 +42,7 @@ typedef struct _EFI_SMM_BASE2_PROTOCOL  EFI_SMM_BASE2_PROTOCOL;
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_SMM_INSIDE_OUT)(\r
+(EFIAPI *EFI_SMM_INSIDE_OUT2)(\r
   IN CONST EFI_SMM_BASE2_PROTOCOL  *This,\r
   OUT BOOLEAN                      *InSmram\r
   )\r
@@ -66,9 +64,9 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_SMM_GET_SMST_LOCATION)(\r
+(EFIAPI *EFI_SMM_GET_SMST_LOCATION2)(\r
   IN CONST EFI_SMM_BASE2_PROTOCOL  *This,\r
-  IN OUT EFI_SMM_SYSTEM_TABLE      **Smst\r
+  IN OUT EFI_SMM_SYSTEM_TABLE2     **Smst\r
   )\r
 ;\r
 \r
@@ -77,8 +75,8 @@ EFI_STATUS
 /// services and determine whether the driver is being invoked inside SMRAM or outside of SMRAM.\r
 ///\r
 struct _EFI_SMM_BASE2_PROTOCOL {\r
-  EFI_SMM_INSIDE_OUT         InSmm;\r
-  EFI_SMM_GET_SMST_LOCATION  GetSmstLocation;\r
+  EFI_SMM_INSIDE_OUT2         InSmm;\r
+  EFI_SMM_GET_SMST_LOCATION2  GetSmstLocation;\r
 };\r
 \r
 extern EFI_GUID gEfiSmmBase2ProtocolGuid;\r