X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxe%2FDxeMain.h;h=e7ec3c856175928f40380d40f68bd51ef2eae9be;hp=4f57b7257f5c575deb1126c448003f2a6fa2a2ad;hb=0677cc4925d580f7016ac092dc591be0ebe03495;hpb=7547649f22102726e555be072e8975a199b027bf

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 4f57b7257f..e7ec3c8561 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -2,8 +2,8 @@
   The internal header file includes the common header files, defines
   internal structure and functions used by DxeCore module.
 
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
@@ -50,6 +50,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/BusSpecificDriverOverride.h>
 #include <Protocol/TcgService.h>
 #include <Protocol/HiiPackageList.h>
+#include <Protocol/SmmBase2.h>
 #include <Guid/MemoryTypeInformation.h>
 #include <Guid/FirmwareFileSystem2.h>
 #include <Guid/HobList.h>
@@ -60,7 +61,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/MemoryAllocationHob.h>
 #include <Guid/EventLegacyBios.h>
 #include <Guid/EventGroup.h>
-
+#include <Guid/LoadModuleAtFixedAddress.h>
 
 #include <Library/DxeCoreEntryPoint.h>
 #include <Library/DebugLib.h>
@@ -73,12 +74,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/CacheMaintenanceLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeCoffLib.h>
+#include <Library/PeCoffGetEntryPointLib.h>
+#include <Library/PeCoffExtraActionLib.h>
 #include <Library/PcdLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DevicePathLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/TimerLib.h>
+#include <Library/DxeServicesLib.h>
+#include <Library/DebugAgentLib.h>
+
 
 //
 // attributes for reserved memory before it is promoted to system memory
@@ -114,7 +120,7 @@ typedef struct {
   EFI_EVENT                   Event;
   VOID                        *Registration;
   BOOLEAN                     Present;
-} ARCHITECTURAL_PROTOCOL_ENTRY;
+} EFI_CORE_PROTOCOL_NOTIFY_ENTRY;
 
 //
 // DXE Dispatcher Data structures
@@ -192,6 +198,7 @@ extern EFI_METRONOME_ARCH_PROTOCOL              *gMetronome;
 extern EFI_TIMER_ARCH_PROTOCOL                  *gTimer;
 extern EFI_SECURITY_ARCH_PROTOCOL               *gSecurity;
 extern EFI_BDS_ARCH_PROTOCOL                    *gBds;
+extern EFI_SMM_BASE2_PROTOCOL                   *gSmmBase2;
 
 extern EFI_TPL                                  gEfiCurrentTpl;
 
@@ -203,6 +210,8 @@ extern EFI_MEMORY_TYPE_INFORMATION              gMemoryTypeInformation[EfiMaxMem
 extern BOOLEAN                                  gDispatcherRunning;
 extern EFI_RUNTIME_ARCH_PROTOCOL                gRuntimeTemplate;
 
+extern EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE    gLoadModuleAtFixAddressConfigurationTable;
+extern BOOLEAN                                       gLoadFixedAddressCodeMemoryReady;
 //
 // Service Initialization Functions
 //
@@ -341,7 +350,7 @@ CoreInitializeImageServices (
 
 **/
 VOID
-CoreNotifyOnArchProtocolInstallation (
+CoreNotifyOnProtocolInstallation (
   VOID
   );
 
@@ -1012,8 +1021,8 @@ CoreLocateHandleBuffer (
 
 /**
   Return the first Protocol Interface that matches the Protocol GUID. If
-  Registration is pasased in return a Protocol Instance that was just add
-  to the system. If Retistration is NULL return the first Protocol Interface
+  Registration is passed in, return a Protocol Instance that was just add
+  to the system. If Registration is NULL return the first Protocol Interface
   you find.
 
   @param  Protocol               The protocol to search for
@@ -1289,6 +1298,14 @@ CoreFreePool (
                                   protocol for loading the file.
   @retval EFI_OUT_OF_RESOURCES    Image was not loaded due to insufficient
                                   resources.
+  @retval EFI_LOAD_ERROR          Image was not loaded because the image format was corrupt or not
+                                  understood.
+  @retval EFI_DEVICE_ERROR        Image was not loaded because the device returned a read error.
+  @retval EFI_ACCESS_DENIED       Image was not loaded because the platform policy prohibits the 
+                                  image from being loaded. NULL is returned in *ImageHandle.
+  @retval EFI_SECURITY_VIOLATION  Image was loaded and an ImageHandle was created with a 
+                                  valid EFI_LOADED_IMAGE_PROTOCOL. However, the current 
+                                  platform policy specifies that the image should not be started.
 
 **/
 EFI_STATUS
@@ -1330,7 +1347,7 @@ CoreUnloadImage (
   @param  ImageHandle             Handle of image to be started.
   @param  ExitDataSize            Pointer of the size to ExitData
   @param  ExitData                Pointer to a pointer to a data buffer that
-                                  includes a Null-terminated Unicode string,
+                                  includes a Null-terminated string,
                                   optionally followed by additional binary data.
                                   The string is a description that the caller may
                                   use to further indicate the reason for the