)\r
;\r
\r
+#define GET_HOB_TYPE(Hob) ((Hob).Header->HobType)\r
+#define GET_HOB_LENGTH(Hob) ((Hob).Header->HobLength)\r
+#define GET_NEXT_HOB(Hob) ((Hob).Raw + GET_HOB_LENGTH (Hob))\r
+#define END_OF_HOB_LIST(Hob) (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_END_OF_HOB_LIST)\r
+\r
+//\r
+// Get the data and data size field of GUID \r
+//\r
+#define GET_GUID_HOB_DATA(GuidHob) ((VOID *) (((UINT8 *) &((GuidHob)->Name)) + sizeof (EFI_GUID)))\r
+#define GET_GUID_HOB_DATA_SIZE(GuidHob) (((GuidHob)->Header).HobLength - sizeof (EFI_HOB_GUID_TYPE))\r
+\r
#endif\r
#ifndef __BASE_PE_COFF_LIB_H__\r
#define __BASE_PE_COFF_LIB_H__\r
\r
-#include <Common/PeCoffLoaderImageContext.h>\r
-\r
//\r
// Return status codes from the PE/COFF Loader services\r
// BUGBUG: Find where used and see if can be replaced by RETURN_STATUS codes\r
#define IMAGE_ERROR_FAILED_RELOCATION 9\r
#define IMAGE_ERROR_FAILED_ICACHE_FLUSH 10\r
\r
+//\r
+// PE/COFF Loader Read Function passed in by caller\r
+//\r
+typedef\r
+RETURN_STATUS\r
+(EFIAPI *PE_COFF_LOADER_READ_FILE) (\r
+ IN VOID *FileHandle,\r
+ IN UINTN FileOffset,\r
+ IN OUT UINTN *ReadSize,\r
+ OUT VOID *Buffer\r
+ );\r
+\r
+//\r
+// Context structure used while PE/COFF image is being loaded and relocated\r
+//\r
+typedef struct {\r
+ PHYSICAL_ADDRESS ImageAddress;\r
+ UINT64 ImageSize;\r
+ PHYSICAL_ADDRESS DestinationAddress;\r
+ PHYSICAL_ADDRESS EntryPoint;\r
+ PE_COFF_LOADER_READ_FILE ImageRead;\r
+ VOID *Handle;\r
+ VOID *FixupData;\r
+ UINT32 SectionAlignment;\r
+ UINT32 PeCoffHeaderOffset;\r
+ UINT32 DebugDirectoryEntryRva;\r
+ VOID *CodeView;\r
+ CHAR8 *PdbPointer;\r
+ UINTN SizeOfHeaders;\r
+ UINT32 ImageCodeMemoryType;\r
+ UINT32 ImageDataMemoryType;\r
+ UINT32 ImageError;\r
+ UINTN FixupDataSize;\r
+ UINT16 Machine;\r
+ UINT16 ImageType;\r
+ BOOLEAN RelocationsStripped;\r
+ BOOLEAN IsTeImage;\r
+} PE_COFF_LOADER_IMAGE_CONTEXT;\r
\r
/**\r
Retrieves information about a PE/COFF image.\r
#define PEI_SERVICES_SIGNATURE 0x5652455320494550\r
#define PEI_SERVICES_REVISION (PEI_SPECIFICATION_MAJOR_REVISION<<16) | (PEI_SPECIFICATION_MINOR_REVISION)\r
\r
-struct EFI_PEI_SERVICES {\r
+struct _EFI_PEI_SERVICES {\r
EFI_TABLE_HEADER Hdr;\r
//\r
// PPI Functions\r
CHAR16 PathName[1];\r
} FILEPATH_DEVICE_PATH;\r
\r
-#define SIZE_OF_FILEPATH_DEVICE_PATH EFI_FIELD_OFFSET(FILEPATH_DEVICE_PATH,PathName)\r
+#define SIZE_OF_FILEPATH_DEVICE_PATH EFI_FIELD_OFFSET(FILEPATH_DEVICE_PATH,PathName)\r
\r
#define MEDIA_PROTOCOL_DP 0x05\r
typedef struct {\r
\r
\r
#define MEDIA_PIWG_FW_VOL_DP 0x6\r
-typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
+typedef struct {\r
+ EFI_DEVICE_PATH_PROTOCOL Header;\r
+ EFI_GUID FvName;\r
+} MEDIA_FW_VOL_DEVICE_PATH;\r
\r
\r
#define MEDIA_PIWG_FW_FILE_DP 0x7\r
-typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_DEVICE_PATH;\r
+typedef struct {\r
+ EFI_DEVICE_PATH_PROTOCOL Header;\r
+ EFI_GUID FvFileName;\r
+} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
\r
//\r
// BBS Device Path\r