Only include SmmCis.h if the CPU Arch is IA32 or X64

Only include SalApi.h if the CPU Arch is IPF

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2108 6f19259b-4bc3-4df7-8a09-765794883524

MdePkg/Include/Dxe.h

@@ -37,10 +37,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   #error EDK_RELEASE_VERSION can not be zero
 #endif
 
-
 #include <Common/UefiBaseTypes.h>
 #include <Dxe/DxeCis.h>
+
+#if defined(MDE_CPU_IA32) || defined(MDE_CPU_X64)
 #include <Dxe/SmmCis.h>
+#endif
+
+#if defined(MDE_CPU_IPF)
+#include <SalApi.h>
+#endif
 
 #include <Common/DataHubRecords.h>
 #include <Guid/DataHubRecords.h>

MdePkg/Include/Dxe/DxeCis.h

@@ -484,6 +484,16 @@ typedef struct {
 } EFI_DXE_SERVICES;
 
 
+//
+// Function prototype for invoking a function on an Application Processor
+// Used by both the SMM infrastructure and the MP Services Protocol
+//
+typedef
+VOID
+(EFIAPI *EFI_AP_PROCEDURE) (
+  IN  VOID                              *Buffer
+  );
+
 #include <Common/BootMode.h>
 #include <Common/BootScript.h>
 #include <Common/Capsule.h>

MdePkg/Include/Dxe/SmmCis.h

@@ -166,12 +166,6 @@ EFI_STATUS
   IN UINTN                  NumberOfPages
   );
 
-typedef
-VOID
-(EFIAPI *EFI_AP_PROCEDURE) (
-  IN  VOID                              *Buffer
-  );
-
 typedef
 EFI_STATUS
 (EFIAPI *EFI_SMM_STARTUP_THIS_AP) (

MdePkg/Include/DxeCore.h

@@ -40,9 +40,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   #error EDK_RELEASE_VERSION can not be zero
 #endif
 
-
-
 #include <Common/UefiBaseTypes.h>
 #include <Dxe/DxeCis.h>
 
+#if defined(MDE_CPU_IPF)
+#include <SalApi.h>
+#endif
+
 #endif

MdePkg/Include/Ipf/ProcessorBind.h

@@ -215,12 +215,5 @@ typedef struct {
   UINT64  GP;
 } EFI_PLABEL;
 
-typedef struct {
-  UINTN BootPhase;      // entry r20 value
-  UINTN UniqueId;       // PAL arbitration ID
-  UINTN HealthStat;     // Health Status
-  UINTN PALRetAddress;  // return address to PAL
-} IPF_HANDOFF_STATUS;
-
 #endif
 

MdePkg/Include/Ipf/SalApi.h

@@ -31,6 +31,16 @@ typedef UINTN EFI_SAL_STATUS;
 #define EFI_SAL_NO_INFORMATION        ((EFI_SAL_STATUS) - 5)
 #define EFI_SAL_NOT_ENOUGH_SCRATCH    ((EFI_SAL_STATUS) - 9)
 
+//
+//  Return values from SAL
+//
+typedef struct {
+  EFI_SAL_STATUS  Status; // register r8
+  UINTN           r9;
+  UINTN           r10;
+  UINTN           r11;
+} SAL_RETURN_REGS;
+
 //
 //  Delivery Mode of IPF CPU.
 //
@@ -45,16 +55,6 @@ typedef enum {
   EFI_DELIVERY_MODE_ExtINT
 } EFI_DELIVERY_MODE;
 
-//
-//  Return values from SAL
-//
-typedef struct {
-  EFI_SAL_STATUS  Status; // register r8
-  UINTN           r9;
-  UINTN           r10;
-  UINTN           r11;
-} SAL_RETURN_REGS;
-
 typedef SAL_RETURN_REGS (EFIAPI *SAL_PROC)
   (
     IN UINT64 FunctionId,

MdePkg/Include/PeiCore.h

@@ -36,6 +36,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Common/UefiBaseTypes.h>
 #include <Peim/PeiCis.h>
 
+#if defined(MDE_CPU_IPF)
+#include <SalApi.h>
+#endif
+
 //
 //StatusCodeDataTypeId needs DebugSupport Protocol definition
 //

MdePkg/Include/Peim.h

@@ -38,6 +38,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Common/UefiBaseTypes.h>
 #include <Peim/PeiCis.h>
 
+#if defined(MDE_CPU_IPF)
+#include <SalApi.h>
+#endif
+ 
 #include <Protocol/Decompress.h>
 
 //

MdePkg/Include/Ppi/SecPlatformInformation.h

@@ -30,6 +30,13 @@ typedef struct _EFI_SEC_PLATFORM_INFORMATION_PPI EFI_SEC_PLATFORM_INFORMATION_PP
 
 extern EFI_GUID gEfiSecPlatformInformationPpiGuid;
 
+typedef struct {
+  UINTN BootPhase;      // entry r20 value
+  UINTN UniqueId;       // PAL arbitration ID
+  UINTN HealthStat;     // Health Status
+  UINTN PALRetAddress;  // return address to PAL
+} IPF_HANDOFF_STATUS;
+
 ///
 /// EFI_HEALTH_FLAGS
 ///

MdePkg/Include/Uefi.h

@@ -49,4 +49,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Common/UefiBaseTypes.h>
 #include <Uefi/UefiSpec.h>
 
+#if defined(MDE_CPU_IPF)
+#include <SalApi.h>
+#endif
+
 #endif