OptionRomPkg/AtapiPassThruDxe: rebase to ARRAY_SIZE()

[mirror_edk2.git] / DuetPkg / EfiLdr / EfiLdr.h

diff --git a/DuetPkg/EfiLdr/EfiLdr.h b/DuetPkg/EfiLdr/EfiLdr.h
index 979ed1d691f7ede88d18fd40ee15d84ffa1631d1..4f21cf3f790f9cb4b10882bff95f07efabdc26e6 100644 (file)
--- a/DuetPkg/EfiLdr/EfiLdr.h
+++ b/DuetPkg/EfiLdr/EfiLdr.h
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -21,7 +21,6 @@ Revision History:
 #ifndef _DUET_EFI_LOADER_H_\r
 #define _DUET_EFI_LOADER_H_\r
 \r
-#include "FrameworkDxe.h"\r
 #include "Uefi.h"\r
 #include "EfiLdrHandoff.h"\r
 \r
@@ -30,6 +29,7 @@ Revision History:
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/PrintLib.h>\r
+#include <Library/SerialPortLib.h>\r
 \r
 #define INT15_E820_AddressRangeMemory   1\r
 #define INT15_E820_AddressRangeReserved 2\r
@@ -42,7 +42,7 @@ Revision History:
 \r
 #define EFI_MAX_MEMORY_DESCRIPTORS 64\r
 \r
-#define LOADED_IMAGE_SIGNATURE     EFI_SIGNATURE_32('l','d','r','i')\r
+#define LOADED_IMAGE_SIGNATURE     SIGNATURE_32('l','d','r','i')\r
 \r
 typedef struct {\r
   UINTN                       Signature;\r
@@ -80,12 +80,9 @@ typedef struct {
   BIOS_MEMORY_MAP_ENTRY MemoryMapEntry[1];\r
 } BIOS_MEMORY_MAP;\r
 \r
-EFILDR_LOADED_IMAGE    DxeCoreImage;\r
-EFILDR_LOADED_IMAGE    DxeIplImage;\r
-\r
 typedef\r
 VOID\r
-(* EFI_MAIN_ENTRYPOINT) (\r
+(EFIAPI * EFI_MAIN_ENTRYPOINT) (\r
     IN EFILDRHANDOFF  *Handoff\r
     );\r
 \r