X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxe%2FDxeMain.h;h=30fffb9f38fee673489492d286e2a0fb637c0fd9;hb=1947c70c3ef17f05c19f777cf1912b090cdaac4b;hp=3d999f906fa2254c969346e85ea0fd32fdf2f79b;hpb=130f16022c545c2fbb0d561fe7cf5c2f1b086cfa;p=mirror_edk2.git

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 3d999f906f..30fffb9f38 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -87,7 +87,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Gcd.h"
 #include "Imem.h"
 #include "Image.h"
-#include "Exec.h"
+#include "Event.h"
 #include "Handle.h"
 
 //
@@ -274,12 +274,11 @@ CoreAcquireGcdMemoryLock (
 
 
 /**
-  External function. Initializes the GCD and memory services based on the memory
-  descriptor HOBs.  This function is responsible for priming the GCD map and the
-  memory map, so memory allocations and resource allocations can be made.  The first
-  part of this function can not depend on any memory services until at least one
-  memory descriptor is provided to the memory services.  Then the memory services
-  can be used to intialize the GCD map.
+  External function. Initializes memory services based on the memory
+  descriptor HOBs.  This function is responsible for priming the memory
+  map, so memory allocations and resource allocations can be made.
+  The first part of this function can not depend on any memory services
+  until at least one memory descriptor is provided to the memory services.
 
   @param  HobStart               The start address of the HOB.
   @param  MemoryBaseAddress      Start address of memory region found to init DXE
@@ -301,11 +300,8 @@ CoreInitializeMemoryServices (
 /**
   External function. Initializes the GCD and memory services based on the memory
   descriptor HOBs.  This function is responsible for priming the GCD map and the
-  memory map, so memory allocations and resource allocations can be made.  The first
-  part of this function can not depend on any memory services until at least one
-  memory descriptor is provided to the memory services.  Then the memory services
-  can be used to intialize the GCD map. The HobStart will be relocated to a pool
-  buffer.
+  memory map, so memory allocations and resource allocations can be made. The
+  HobStart will be relocated to a pool buffer.
 
   @param  HobStart               The start address of the HOB
   @param  MemoryBaseAddress      Start address of memory region found to init DXE
@@ -324,7 +320,7 @@ CoreInitializeGcdServices (
 
 
 /**
-  Initializes "event" support and populates parts of the System and Runtime Table.
+  Initializes "event" support.
 
   @retval EFI_SUCCESS            Always return success
 
@@ -1562,6 +1558,7 @@ CoreCheckEvent (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreAddMemorySpace (
   IN EFI_GCD_MEMORY_TYPE   GcdMemoryType,
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
@@ -1588,6 +1585,7 @@ CoreAddMemorySpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreAllocateMemorySpace (
   IN     EFI_GCD_ALLOCATE_TYPE  GcdAllocateType,
   IN     EFI_GCD_MEMORY_TYPE    GcdMemoryType,
@@ -1610,6 +1608,7 @@ CoreAllocateMemorySpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreFreeMemorySpace (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length
@@ -1627,6 +1626,7 @@ CoreFreeMemorySpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreRemoveMemorySpace (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length
@@ -1644,6 +1644,7 @@ CoreRemoveMemorySpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreGetMemorySpaceDescriptor (
   IN  EFI_PHYSICAL_ADDRESS             BaseAddress,
   OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *Descriptor
@@ -1663,6 +1664,7 @@ CoreGetMemorySpaceDescriptor (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreSetMemorySpaceAttributes (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length,
@@ -1683,6 +1685,7 @@ CoreSetMemorySpaceAttributes (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreGetMemorySpaceMap (
   OUT UINTN                            *NumberOfDescriptors,
   OUT EFI_GCD_MEMORY_SPACE_DESCRIPTOR  **MemorySpaceMap
@@ -1701,6 +1704,7 @@ CoreGetMemorySpaceMap (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreAddIoSpace (
   IN EFI_GCD_IO_TYPE       GcdIoType,
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
@@ -1726,6 +1730,7 @@ CoreAddIoSpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreAllocateIoSpace (
   IN     EFI_GCD_ALLOCATE_TYPE  GcdAllocateType,
   IN     EFI_GCD_IO_TYPE        GcdIoType,
@@ -1748,6 +1753,7 @@ CoreAllocateIoSpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreFreeIoSpace (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length
@@ -1765,6 +1771,7 @@ CoreFreeIoSpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreRemoveIoSpace (
   IN EFI_PHYSICAL_ADDRESS  BaseAddress,
   IN UINT64                Length
@@ -1782,6 +1789,7 @@ CoreRemoveIoSpace (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreGetIoSpaceDescriptor (
   IN  EFI_PHYSICAL_ADDRESS         BaseAddress,
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  *Descriptor
@@ -1800,6 +1808,7 @@ CoreGetIoSpaceDescriptor (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreGetIoSpaceMap (
   OUT UINTN                        *NumberOfDescriptors,
   OUT EFI_GCD_IO_SPACE_DESCRIPTOR  **IoSpaceMap
@@ -1947,6 +1956,7 @@ InitializeSectionExtraction (
 
 **/
 EFI_STATUS
+EFIAPI
 CoreProcessFirmwareVolume (
   IN VOID                             *FvHeader,
   IN UINTN                            Size,