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

diff --git a/MdePkg/Include/Dxe.h b/MdePkg/Include/Dxe.h
index 42168297b900fd4425a7650c16500c5208688b00..781b8cf5c97643773e77560f4572db8e83482eb3 100644 (file)
--- a/MdePkg/Include/Dxe.h
+++ b/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\r
 #endif\r
 \r
   #error EDK_RELEASE_VERSION can not be zero\r
 #endif\r
 \r

-\r

 #include <Common/UefiBaseTypes.h>\r
 #include <Dxe/DxeCis.h>\r
 #include <Common/UefiBaseTypes.h>\r
 #include <Dxe/DxeCis.h>\r

+\r
+#if defined(MDE_CPU_IA32) || defined(MDE_CPU_X64)\r

 #include <Dxe/SmmCis.h>\r
 #include <Dxe/SmmCis.h>\r

+#endif\r
+\r
+#if defined(MDE_CPU_IPF)\r
+#include <SalApi.h>\r
+#endif\r

 \r
 #include <Common/DataHubRecords.h>\r
 #include <Guid/DataHubRecords.h>\r
 \r
 #include <Common/DataHubRecords.h>\r
 #include <Guid/DataHubRecords.h>\r

diff --git a/MdePkg/Include/Dxe/DxeCis.h b/MdePkg/Include/Dxe/DxeCis.h
index 9b1d5ce966ed7e18ac67808f6353c56739b06401..e1d794fffd86cb9e2b49d14684d0478770803458 100644 (file)
--- a/MdePkg/Include/Dxe/DxeCis.h
+++ b/MdePkg/Include/Dxe/DxeCis.h
@@ -484,6 +484,16 @@ typedef struct {
 } EFI_DXE_SERVICES;\r
 \r
 \r
 } EFI_DXE_SERVICES;\r
 \r
 \r

+//\r
+// Function prototype for invoking a function on an Application Processor\r
+// Used by both the SMM infrastructure and the MP Services Protocol\r
+//\r
+typedef\r
+VOID\r
+(EFIAPI *EFI_AP_PROCEDURE) (\r
+  IN  VOID                              *Buffer\r
+  );\r
+\r

 #include <Common/BootMode.h>\r
 #include <Common/BootScript.h>\r
 #include <Common/Capsule.h>\r
 #include <Common/BootMode.h>\r
 #include <Common/BootScript.h>\r
 #include <Common/Capsule.h>\r

diff --git a/MdePkg/Include/Dxe/SmmCis.h b/MdePkg/Include/Dxe/SmmCis.h
index d2f2e17de5089c36865a5405feb756064e161e26..aeb8f110fed646c26b3e616fbb86bc05b6cb7bac 100644 (file)
--- a/MdePkg/Include/Dxe/SmmCis.h
+++ b/MdePkg/Include/Dxe/SmmCis.h
@@ -166,12 +166,6 @@ EFI_STATUS
   IN UINTN                  NumberOfPages\r
   );\r
 \r
   IN UINTN                  NumberOfPages\r
   );\r
 \r

-typedef\r
-VOID\r
-(EFIAPI *EFI_AP_PROCEDURE) (\r
-  IN  VOID                              *Buffer\r
-  );\r
-\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SMM_STARTUP_THIS_AP) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SMM_STARTUP_THIS_AP) (\r

diff --git a/MdePkg/Include/DxeCore.h b/MdePkg/Include/DxeCore.h
index f4f57f5d4fa913961ebc7767fd078ddbc3991401..fde616813154c2131bca67ab492ea780df1c1dea 100644 (file)
--- a/MdePkg/Include/DxeCore.h
+++ b/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\r
 #endif\r
 \r
   #error EDK_RELEASE_VERSION can not be zero\r
 #endif\r
 \r

-\r
-\r

 #include <Common/UefiBaseTypes.h>\r
 #include <Dxe/DxeCis.h>\r
 \r
 #include <Common/UefiBaseTypes.h>\r
 #include <Dxe/DxeCis.h>\r
 \r

+#if defined(MDE_CPU_IPF)\r
+#include <SalApi.h>\r
+#endif\r
+\r

 #endif\r
 #endif\r

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index a7fc3a9d8ed39cff5777e4da5ece771ae858dbd8..119b5913c44c3ec4b4db4ee3365fb3ffe0084452 100644 (file)
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -215,12 +215,5 @@ typedef struct {
   UINT64  GP;\r
 } EFI_PLABEL;\r
 \r
   UINT64  GP;\r
 } EFI_PLABEL;\r
 \r

-typedef struct {\r
-  UINTN BootPhase;      // entry r20 value\r
-  UINTN UniqueId;       // PAL arbitration ID\r
-  UINTN HealthStat;     // Health Status\r
-  UINTN PALRetAddress;  // return address to PAL\r
-} IPF_HANDOFF_STATUS;\r
-\r

 #endif\r
 \r
 #endif\r
 \r

diff --git a/MdePkg/Include/Ipf/SalApi.h b/MdePkg/Include/Ipf/SalApi.h
index a9520c1b20190371b5b1da55959b3c49f3bac9cc..ae3c77bf0885f51250c3e559075bc7b2bbe6e195 100644 (file)
--- a/MdePkg/Include/Ipf/SalApi.h
+++ b/MdePkg/Include/Ipf/SalApi.h
@@ -31,6 +31,16 @@ typedef UINTN EFI_SAL_STATUS;
 #define EFI_SAL_NO_INFORMATION        ((EFI_SAL_STATUS) - 5)\r
 #define EFI_SAL_NOT_ENOUGH_SCRATCH    ((EFI_SAL_STATUS) - 9)\r
 \r
 #define EFI_SAL_NO_INFORMATION        ((EFI_SAL_STATUS) - 5)\r
 #define EFI_SAL_NOT_ENOUGH_SCRATCH    ((EFI_SAL_STATUS) - 9)\r
 \r

+//\r
+//  Return values from SAL\r
+//\r
+typedef struct {\r
+  EFI_SAL_STATUS  Status; // register r8\r
+  UINTN           r9;\r
+  UINTN           r10;\r
+  UINTN           r11;\r
+} SAL_RETURN_REGS;\r
+\r

 //\r
 //  Delivery Mode of IPF CPU.\r
 //\r
 //\r
 //  Delivery Mode of IPF CPU.\r
 //\r


@@ -45,16 +55,6 @@ typedef enum {
   EFI_DELIVERY_MODE_ExtINT\r
 } EFI_DELIVERY_MODE;\r
 \r
   EFI_DELIVERY_MODE_ExtINT\r
 } EFI_DELIVERY_MODE;\r
 \r

-//\r
-//  Return values from SAL\r
-//\r
-typedef struct {\r
-  EFI_SAL_STATUS  Status; // register r8\r
-  UINTN           r9;\r
-  UINTN           r10;\r
-  UINTN           r11;\r
-} SAL_RETURN_REGS;\r
-\r

 typedef SAL_RETURN_REGS (EFIAPI *SAL_PROC)\r
   (\r
     IN UINT64 FunctionId,\r
 typedef SAL_RETURN_REGS (EFIAPI *SAL_PROC)\r
   (\r
     IN UINT64 FunctionId,\r

diff --git a/MdePkg/Include/PeiCore.h b/MdePkg/Include/PeiCore.h
index f0879c7c471e7aedf88560b01713a558c2f49306..4a22c78a29b56307a99edb639ec7c57b47368994 100644 (file)
--- a/MdePkg/Include/PeiCore.h
+++ b/MdePkg/Include/PeiCore.h
@@ -36,6 +36,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Common/UefiBaseTypes.h>\r
 #include <Peim/PeiCis.h>\r
 \r
 #include <Common/UefiBaseTypes.h>\r
 #include <Peim/PeiCis.h>\r
 \r

+#if defined(MDE_CPU_IPF)\r
+#include <SalApi.h>\r
+#endif\r
+\r

 //\r
 //StatusCodeDataTypeId needs DebugSupport Protocol definition\r
 //\r
 //\r
 //StatusCodeDataTypeId needs DebugSupport Protocol definition\r
 //\r

diff --git a/MdePkg/Include/Peim.h b/MdePkg/Include/Peim.h
index 97c934b69470f92a0c1b5ea0e0dbb650db10f819..f5b263ab98e371e53359e324180fdd96992f1614 100644 (file)
--- a/MdePkg/Include/Peim.h
+++ b/MdePkg/Include/Peim.h
@@ -38,6 +38,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Common/UefiBaseTypes.h>\r
 #include <Peim/PeiCis.h>\r
 \r
 #include <Common/UefiBaseTypes.h>\r
 #include <Peim/PeiCis.h>\r
 \r

+#if defined(MDE_CPU_IPF)\r
+#include <SalApi.h>\r
+#endif\r
+ \r

 #include <Protocol/Decompress.h>\r
 \r
 //\r
 #include <Protocol/Decompress.h>\r
 \r
 //\r

diff --git a/MdePkg/Include/Ppi/SecPlatformInformation.h b/MdePkg/Include/Ppi/SecPlatformInformation.h
index b7dd03e6ce42bd299881a5e73fd3bdc7f2e2a21a..bcba5dbf2af6f5d0cce9b2aac81c79257f54a66c 100644 (file)
--- a/MdePkg/Include/Ppi/SecPlatformInformation.h
+++ b/MdePkg/Include/Ppi/SecPlatformInformation.h
@@ -30,6 +30,13 @@ typedef struct _EFI_SEC_PLATFORM_INFORMATION_PPI EFI_SEC_PLATFORM_INFORMATION_PP
 \r
 extern EFI_GUID gEfiSecPlatformInformationPpiGuid;\r
 \r
 \r
 extern EFI_GUID gEfiSecPlatformInformationPpiGuid;\r
 \r

+typedef struct {\r
+  UINTN BootPhase;      // entry r20 value\r
+  UINTN UniqueId;       // PAL arbitration ID\r
+  UINTN HealthStat;     // Health Status\r
+  UINTN PALRetAddress;  // return address to PAL\r
+} IPF_HANDOFF_STATUS;\r
+\r

 ///\r
 /// EFI_HEALTH_FLAGS\r
 ///\r
 ///\r
 /// EFI_HEALTH_FLAGS\r
 ///\r

diff --git a/MdePkg/Include/Uefi.h b/MdePkg/Include/Uefi.h
index bb2599583f6b9af54a53b7c31ec4ed1dbb9405fe..1912f857d992214fe42248f6c9c19e0ac959363d 100644 (file)
--- a/MdePkg/Include/Uefi.h
+++ b/MdePkg/Include/Uefi.h
@@ -49,4 +49,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Common/UefiBaseTypes.h>\r
 #include <Uefi/UefiSpec.h>\r
 \r
 #include <Common/UefiBaseTypes.h>\r
 #include <Uefi/UefiSpec.h>\r
 \r

+#if defined(MDE_CPU_IPF)\r
+#include <SalApi.h>\r
+#endif\r
+\r

 #endif\r
 #endif\r