From 0d24d7d68ba7565366f73b255b3ba41eb6ae7636 Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Fri, 15 May 2015 00:40:29 +0000 Subject: [PATCH] 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 Reviewed-by: Jeff Fan Reviewed-by: Liming Gao Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17450 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Include/Pi/PiDxeCis.h | 15 --------------- MdePkg/Include/Pi/PiMultiPhase.h | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h index a2208dffc2..3292809851 100644 --- a/MdePkg/Include/Pi/PiDxeCis.h +++ b/MdePkg/Include/Pi/PiDxeCis.h @@ -737,19 +737,4 @@ typedef struct { typedef DXE_SERVICES EFI_DXE_SERVICES; - -/** - The function prototype for invoking a function on an Application Processor. - - This definition is used by the UEFI MP Serices Protocol, and the - PI SMM System Table. - - @param[in,out] Buffer The pointer to private data buffer. -**/ -typedef -VOID -(EFIAPI *EFI_AP_PROCEDURE)( - IN OUT VOID *Buffer - ); - #endif diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h index 2aa4c276c4..169258caa8 100644 --- a/MdePkg/Include/Pi/PiMultiPhase.h +++ b/MdePkg/Include/Pi/PiMultiPhase.h @@ -1,7 +1,7 @@ /** @file Include file matches things in PI for multiple module types. -Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at @@ -162,4 +162,18 @@ typedef struct { CHAR8 *PcdName; } EFI_PCD_INFO; +/** + The function prototype for invoking a function on an Application Processor. + + This definition is used by the UEFI MP Serices Protocol, and the + PI SMM System Table. + + @param[in,out] Buffer The pointer to private data buffer. +**/ +typedef +VOID +(EFIAPI *EFI_AP_PROCEDURE)( + IN OUT VOID *Buffer + ); + #endif -- 2.39.2