MdePkg: Fix PI Multi-processor PPI header file include issue

Multi-processor PPI header file 'Ppi/Mpservices.h' uses a function
prototype EFI_AP_PROCEDURE which is defined in 'Pi/PiDxeCis.h' (DXE header
file).

This will cause a build fail when 'Ppi/Mpservices.h' is included in a PEI
module.

Since both phase support multi-processor service now, function prototype
EFI_AP_PROCEDURE should be moved to 'Pi/PiMultiPhase.h'. The move is a
compatible change and will not affect other codes.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17450 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index a2208dffc2d7e389a5dbf8a0e0ae8aabbc964e4d..3292809851629057830ba45c82c118fda7f89408 100644 (file)
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -737,19 +737,4 @@ typedef struct {
 \r
 typedef DXE_SERVICES EFI_DXE_SERVICES;\r
 \r
-\r
-/**\r
-  The function prototype for invoking a function on an Application Processor.\r
-\r
-  This definition is used by the UEFI MP Serices Protocol, and the\r
-  PI SMM System Table.\r
-\r
-  @param[in,out] Buffer  The pointer to private data buffer.\r
-**/\r
-typedef\r
-VOID\r
-(EFIAPI *EFI_AP_PROCEDURE)(\r
-  IN OUT VOID  *Buffer\r
-  );\r
-\r
 #endif\r

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index 2aa4c276c484b9a7af231e2de4ba1b8b33d6bd0c..169258caa89d906fd74e864b80661f370ccf6247 100644 (file)
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file\r
   Include file matches things in PI for multiple module types.\r
 \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials are licensed and made available under \r
 the terms and conditions of the BSD License that accompanies this distribution.  \r
 The full text of the license may be found at\r
@@ -162,4 +162,18 @@ typedef struct {
   CHAR8             *PcdName;\r
 } EFI_PCD_INFO;\r
 \r
+/**\r
+  The function prototype for invoking a function on an Application Processor.\r
+\r
+  This definition is used by the UEFI MP Serices Protocol, and the\r
+  PI SMM System Table.\r
+\r
+  @param[in,out] Buffer  The pointer to private data buffer.\r
+**/\r
+typedef\r
+VOID\r
+(EFIAPI *EFI_AP_PROCEDURE)(\r
+  IN OUT VOID  *Buffer\r
+  );\r
+\r
 #endif\r