Minor code enhancement.

[mirror_edk2.git] / IntelFrameworkPkg / Include / Protocol / FrameworkMpService.h

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkMpService.h b/IntelFrameworkPkg/Include/Protocol/FrameworkMpService.h
index e11bb7047a99c38f11c7074f19df51e5a2b8fdd9..fe6382740341cf6ec26dcad75921014ffceb4ad2 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkMpService.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkMpService.h
@@ -33,7 +33,7 @@
   APs to help test system memory in parallel with other device initialization.\r
   Diagnostics applications may also use this protocol for multi-processor.\r
 \r
-  Copyright (c) 1999 - 2002, 2009, Intel Corporation.<BR>\r
+  Copyright (c) 1999 - 2010, Intel Corporation.<BR>\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<BR>\r
@@ -42,11 +42,13 @@
   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
 \r
 #ifndef _FRAMEWORK_MP_SERVICE_PROTOCOL_H_\r
 #define _FRAMEWORK_MP_SERVICE_PROTOCOL_H_\r
 \r
+#include <FrameworkDxe.h>\r
+\r
 ///\r
 /// Global ID for the FRAMEWORK_EFI_MP_SERVICES_PROTOCOL\r
 ///\r
@@ -143,7 +145,7 @@ typedef struct {
   /// @par IPF:\r
   ///   Lower 32 bits of self test state parameter. For definition of self test \r
   ///   state parameter, please refer to Intel(R) Itanium(R) Architecture Software \r
-  ///   Developer\92s Manual, Volume 2: System Architecture.\r
+  ///   Developer's Manual, Volume 2: System Architecture.\r
   ///\r
   EFI_MP_HEALTH_FLAGS  Flags;\r
   ///\r
@@ -191,7 +193,7 @@ typedef struct {
   ///\r
   /// @par IPF:\r
   ///   Bit format of this field is the same as the definition of self-test state \r
-  ///   parameter, in Intel® Itanium® Architecture Software Developer\92s Manual, \r
+  ///   parameter, in Intel(R) Itanium(R) Architecture Software Developer's Manual, \r
   ///   Volume 2: System Architecture.\r
   ///\r
   EFI_MP_HEALTH        Health;\r
@@ -259,7 +261,7 @@ typedef struct {
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *FRAMEWORK_EFI_MP_SERVICES_GET_GENERAL_MP_INFO)(\r
+(EFIAPI *EFI_MP_SERVICES_GET_GENERAL_MP_INFO)(\r
   IN  FRAMEWORK_EFI_MP_SERVICES_PROTOCOL  *This,\r
   OUT UINTN                               *NumberOfCPUs          OPTIONAL,\r
   OUT UINTN                               *MaximumNumberOfCPUs   OPTIONAL,\r
@@ -312,7 +314,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *FRAMEWORK_EFI_MP_SERVICES_GET_PROCESSOR_CONTEXT)(\r
+(EFIAPI *EFI_MP_SERVICES_GET_PROCESSOR_CONTEXT)(\r
   IN     FRAMEWORK_EFI_MP_SERVICES_PROTOCOL  *This,\r
   IN     UINTN                               ProcessorNumber,\r
   IN OUT UINTN                               *BufferLength,\r
@@ -377,7 +379,7 @@ EFI_STATUS
                                       If the value is not zero, the BSP waits \r
                                       until all APs finish or timeout expires. \r
                                       If timeout expires, EFI_TIMEOUT is returned,\r
-                                      and the BSP will then check APs\92 status \r
+                                      and the BSP will then check APs?status \r
                                       periodically, with time interval of 16 \r
                                       microseconds.\r
                                       - IPF:\r
@@ -475,7 +477,7 @@ EFI_STATUS
                                      If the value is not zero, the BSP waits until \r
                                      the AP finishes or timeout expires. If timeout \r
                                      expires, EFI_TIMEOUT is returned, and the \r
-                                     BSP will then check the AP\92s status periodically, \r
+                                     BSP will then check the AP's status periodically, \r
                                      with time interval of 16 microseconds.\r
                                      - IPF:\r
                                      If WaitEvent is NULL, this parameter is ignored.\r
@@ -575,7 +577,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *FRAMEWORK_EFI_MP_SERVICES_SEND_IPI)(\r
+(EFIAPI *EFI_MP_SERVICES_SEND_IPI)(\r
   IN FRAMEWORK_EFI_MP_SERVICES_PROTOCOL  *This,\r
   IN UINTN                               ProcessorNumber,\r
   IN UINTN                               VectorNumber,\r
@@ -644,13 +646,13 @@ EFI_STATUS
 ///\r
 /// Framework MP Services Protocol structure\r
 ///\r
-typedef struct _FRAMEWORK_EFI_MP_SERVICES_PROTOCOL {\r
-  FRAMEWORK_EFI_MP_SERVICES_GET_GENERAL_MP_INFO    GetGeneralMPInfo;\r
-  FRAMEWORK_EFI_MP_SERVICES_GET_PROCESSOR_CONTEXT  GetProcessorContext;\r
+struct _FRAMEWORK_EFI_MP_SERVICES_PROTOCOL {\r
+  EFI_MP_SERVICES_GET_GENERAL_MP_INFO              GetGeneralMPInfo;\r
+  EFI_MP_SERVICES_GET_PROCESSOR_CONTEXT            GetProcessorContext;\r
   FRAMEWORK_EFI_MP_SERVICES_STARTUP_ALL_APS        StartupAllAPs;\r
   FRAMEWORK_EFI_MP_SERVICES_STARTUP_THIS_AP        StartupThisAP;\r
   FRAMEWORK_EFI_MP_SERVICES_SWITCH_BSP             SwitchBSP;\r
-  FRAMEWORK_EFI_MP_SERVICES_SEND_IPI               SendIPI;\r
+  EFI_MP_SERVICES_SEND_IPI                         SendIPI;\r
   FRAMEWORK_EFI_MP_SERVICES_ENABLEDISABLEAP        EnableDisableAP;\r
   FRAMEWORK_EFI_MP_SERVICES_WHOAMI                 WhoAmI;\r
 };\r