MdePkg: Clean up source files

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

diff --git a/MdePkg/Include/Protocol/SmmBase2.h b/MdePkg/Include/Protocol/SmmBase2.h
index 4f986188c8be597519415bd77f1ae981995a65c1..17b358f566fc149422d1c7dd085f9fe9ac1c66b4 100644 (file)
--- a/MdePkg/Include/Protocol/SmmBase2.h
+++ b/MdePkg/Include/Protocol/SmmBase2.h
@@ -4,14 +4,14 @@
   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
-  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
+  Copyright (c) 2009 - 2018, 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
 \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
@@ -19,23 +19,21 @@
 #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
 /**\r
   Service to indicate whether the driver is currently executing in the SMM Initialization phase.\r
-  \r
-  This service is used to indicate whether the driver is currently executing in the SMM Initialization \r
-  phase. For SMM drivers, this will return TRUE in InSmram while inside the driver's entry point and \r
+\r
+  This service is used to indicate whether the driver is currently executing in the SMM Initialization\r
+  phase. For SMM drivers, this will return TRUE in InSmram while inside the driver's entry point and\r
   otherwise FALSE. For combination SMM/DXE drivers, this will return FALSE in the DXE launch. For the\r
   SMM launch, it behaves as an SMM driver.\r
 \r
-  @param[in]  This               The EFI_SMM_BASE2_PROTOCOL instance. \r
+  @param[in]  This               The EFI_SMM_BASE2_PROTOCOL instance.\r
   @param[out] InSmram            Pointer to a Boolean which, on return, indicates that the driver is\r
                                  currently executing inside of SMRAM (TRUE) or outside of SMRAM (FALSE).\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
@@ -53,8 +51,8 @@ EFI_STATUS
 /**\r
   Returns the location of the System Management Service Table (SMST).\r
 \r
-  This function returns the location of the System Management Service Table (SMST).  The use of the \r
-  API is such that a driver can discover the location of the SMST in its entry point and then cache it in \r
+  This function returns the location of the System Management Service Table (SMST).  The use of the\r
+  API is such that a driver can discover the location of the SMST in its entry point and then cache it in\r
   some driver global variable so that the SMST can be invoked in subsequent handlers.\r
 \r
   @param[in]     This            The EFI_SMM_BASE2_PROTOCOL instance.\r
@@ -66,7 +64,7 @@ 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_TABLE2     **Smst\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