From ca3ad58bfa2284f0dc98ec904423e83874a90f52 Mon Sep 17 00:00:00 2001
From: andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Sun, 31 Jan 2010 01:39:20 +0000
Subject: Updated to support passing PE/COFF and LZMA decompress up via HOBS.
 Currently turned off.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9887 6f19259b-4bc3-4df7-8a09-765794883524
---
 EmbeddedPkg/Include/Guid/ExtractSection.h     |  7 ++++--
 EmbeddedPkg/Include/Library/PrePiLib.h        |  1 +
 EmbeddedPkg/Include/Protocol/ExtractSection.h | 33 ---------------------------
 EmbeddedPkg/Include/Protocol/PeCoffLoader.h   |  3 +++
 4 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100755 EmbeddedPkg/Include/Protocol/ExtractSection.h

(limited to 'EmbeddedPkg/Include')

diff --git a/EmbeddedPkg/Include/Guid/ExtractSection.h b/EmbeddedPkg/Include/Guid/ExtractSection.h
index 4dedb60b10..5d337d470c 100755
--- a/EmbeddedPkg/Include/Guid/ExtractSection.h
+++ b/EmbeddedPkg/Include/Guid/ExtractSection.h
@@ -22,11 +22,14 @@
 // The GUID for this protocol mathes the Decompression scheme being used
 // So for example LZMA would be gLzmaCustomDecompressGuid
 //
-
 typedef struct {
-  EFI_HOB_GUID_TYPE                         Hob;                             
   EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER   SectionGetInfo;
   EXTRACT_GUIDED_SECTION_DECODE_HANDLER     SectionExtraction;
+} EXTRACT_SECTION_DATA;
+
+typedef struct {
+  EFI_HOB_GUID_TYPE     Hob;     
+  EXTRACT_SECTION_DATA  Data;
 } EXTRACT_SECTION_HOB;
 
 #endif
diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h b/EmbeddedPkg/Include/Library/PrePiLib.h
index 3e4e6c023d..647cd0cb7e 100644
--- a/EmbeddedPkg/Include/Library/PrePiLib.h
+++ b/EmbeddedPkg/Include/Library/PrePiLib.h
@@ -678,6 +678,7 @@ BuildExtractSectionHob (
 VOID
 EFIAPI
 BuildPeCoffLoaderHob (
+  VOID
   );
 
 
diff --git a/EmbeddedPkg/Include/Protocol/ExtractSection.h b/EmbeddedPkg/Include/Protocol/ExtractSection.h
deleted file mode 100755
index 2860472be5..0000000000
--- a/EmbeddedPkg/Include/Protocol/ExtractSection.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/** @file
-
-  Copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
-
-  All rights reserved. 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
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef __EXTRACT_SECTION_PROTOCOL_H__
-#define __EXTRACT_SECTION_PROTOCOL_H__
-
-
-//
-// The GUID for this protocol mathes the Decompression scheme being used
-// So for example LZMA would be gLzmaCustomDecompressGuid
-//
-
-typedef struct {
-  EFI_HOB_GUID_TYPE                         Hob;
-  EXTRACT_GUIDED_SECTION_GET_INFO_HANDLER   SectionGetInfo;
-  EXTRACT_GUIDED_SECTION_DECODE_HANDLER     SectionExtraction;
-} PROTOCOL_HOB;
-
-
-#endif
-
-
diff --git a/EmbeddedPkg/Include/Protocol/PeCoffLoader.h b/EmbeddedPkg/Include/Protocol/PeCoffLoader.h
index d6b4c03bd8..aa600122ed 100755
--- a/EmbeddedPkg/Include/Protocol/PeCoffLoader.h
+++ b/EmbeddedPkg/Include/Protocol/PeCoffLoader.h
@@ -15,6 +15,9 @@
 #ifndef __PE_COFF_LOADER_H__
 #define __PE_COFF_LOADER_H__
 
+// Needed for PE_COFF_LOADER_IMAGE_CONTEXT
+#include <Library/PeCoffLib.h>
+
 // B323179B-97FB-477E-B0FE-D88591FA11AB
 #define PE_COFF_LOADER_PROTOCOL_GUID \
   { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } }
-- 
cgit v1.2.3