X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxe%2FDxeMain.h;h=2ffe9a2efdd25dbe902020b34d3ebe5d37ab730f;hb=1349236994106e461f82b2df1df5ebbf1bd80898;hp=944a8fcd3fd18780ea8ce1e023646423f19a6b33;hpb=7ffbd6182d38e643c3696b971d6d5ad3e7123e6f;p=mirror_edk2.git

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 944a8fcd3f..2ffe9a2efd 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -88,7 +88,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Imem.h"
 #include "Image.h"
 #include "Exec.h"
-#include "Hand.h"
+#include "Handle.h"
 
 //
 // attributes for reserved memory before it is promoted to system memory
@@ -106,7 +106,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///
 /// EFI_DEP_REPLACE_TRUE - Used to dynamically patch the dependecy expression
 ///                        to save time.  A EFI_DEP_PUSH is evauated one an
-///                        replaced with EFI_DEP_REPLACE_TRUE
+///                        replaced with EFI_DEP_REPLACE_TRUE. If PI spec's Vol 2
+///                        Driver Execution Environment Core Interface use 0xff
+///                        as new DEPEX opcode. EFI_DEP_REPLACE_TRUE should be
+///                        defined to a new value that is not conflicting with PI spec.
 ///
 #define EFI_DEP_REPLACE_TRUE  0xff
 
@@ -1559,6 +1562,7 @@ CoreCheckEvent (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreAddMemorySpace (
   IN EFI_GCD_MEMORY_TYPE   GcdMemoryType,
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
@@ -1585,6 +1589,7 @@ CoreAddMemorySpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreAllocateMemorySpace (
   IN     EFI_GCD_ALLOCATE_TYPE  GcdAllocateType,
   IN     EFI_GCD_MEMORY_TYPE    GcdMemoryType,
@@ -1607,6 +1612,7 @@ CoreAllocateMemorySpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreFreeMemorySpace (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length
@@ -1624,6 +1630,7 @@ CoreFreeMemorySpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreRemoveMemorySpace (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length
@@ -1641,6 +1648,7 @@ CoreRemoveMemorySpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreGetMemorySpaceDescriptor (
   IN  EFI_PHYSICAL_ADDRESS             BaseAddress,
   OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *Descriptor
@@ -1660,6 +1668,7 @@ CoreGetMemorySpaceDescriptor (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreSetMemorySpaceAttributes (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length,
@@ -1680,6 +1689,7 @@ CoreSetMemorySpaceAttributes (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreGetMemorySpaceMap (
   OUT UINTN                            *NumberOfDescriptors,
   OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  **MemorySpaceMap
@@ -1698,6 +1708,7 @@ CoreGetMemorySpaceMap (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreAddIoSpace (
   IN EFI_GCD_IO_TYPE       GcdIoType,
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
@@ -1723,6 +1734,7 @@ CoreAddIoSpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreAllocateIoSpace (
   IN     EFI_GCD_ALLOCATE_TYPE  GcdAllocateType,
   IN     EFI_GCD_IO_TYPE        GcdIoType,
@@ -1745,6 +1757,7 @@ CoreAllocateIoSpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreFreeIoSpace (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length
@@ -1762,6 +1775,7 @@ CoreFreeIoSpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreRemoveIoSpace (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length
@@ -1779,6 +1793,7 @@ CoreRemoveIoSpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreGetIoSpaceDescriptor (
   IN  EFI_PHYSICAL_ADDRESS         BaseAddress,
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  *Descriptor
@@ -1797,6 +1812,7 @@ CoreGetIoSpaceDescriptor (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreGetIoSpaceMap (
   OUT UINTN                        *NumberOfDescriptors,
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  **IoSpaceMap
@@ -1944,6 +1960,7 @@ InitializeSectionExtraction (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreProcessFirmwareVolume (
   IN VOID                             *FvHeader,
   IN UINTN                            Size,