Removed IntelframeworkPkg contamination from MdeModulePkg modules.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3019 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 157 insertions, 18 deletions

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index 6c95637..d9bb3e3 100644
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -86,4 +86,13 @@ typedef struct {
   EFI_GUID  Type;

 } EFI_STATUS_CODE_DATA;

 

+

+//

+// Bit values for AuthenticationStatus

+//

+#define EFI_AUTH_STATUS_PLATFORM_OVERRIDE   0x01

+#define EFI_AUTH_STATUS_IMAGE_SIGNED        0x02

+#define EFI_AUTH_STATUS_NOT_TESTED          0x04

+#define EFI_AUTH_STATUS_TEST_FAILED         0x08

+

 #endif

diff --git a/MdePkg/Include/Ppi/GuidedSectionExtraction.h b/MdePkg/Include/Ppi/GuidedSectionExtraction.h
index a5be774..80b1ee1 100644
--- a/MdePkg/Include/Ppi/GuidedSectionExtraction.h
+++ b/MdePkg/Include/Ppi/GuidedSectionExtraction.h
@@ -37,13 +37,6 @@
 

 typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI   EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI;

 

-//

-// Bit values for AuthenticationStatus

-//

-#define EFI_AUTH_STATUS_PLATFORM_OVERRIDE   0x01

-#define EFI_AUTH_STATUS_IMAGE_SIGNED        0x02

-#define EFI_AUTH_STATUS_NOT_TESTED          0x04

-#define EFI_AUTH_STATUS_TEST_FAILED         0x08

 

 /**

   The ExtractSection() function processes the input section and

diff --git a/MdePkg/Include/Ppi/ReadOnlyVariable2.h b/MdePkg/Include/Ppi/ReadOnlyVariable2.h
index 03e7796..f4f8508 100644
--- a/MdePkg/Include/Ppi/ReadOnlyVariable2.h
+++ b/MdePkg/Include/Ppi/ReadOnlyVariable2.h
@@ -69,7 +69,7 @@ EFI_STATUS
   OUT       UINT32                          *Attributes,

   IN OUT    UINTN                           *DataSize,

   OUT       VOID                            *Data

-);

+  );

 

 

 /**

@@ -112,7 +112,7 @@ EFI_STATUS
   IN OUT    UINTN                           *VariableNameSize,

   IN OUT    CHAR16                          *VariableName,

   IN OUT    EFI_GUID                        *VariableGuid

-);

+  );

 

 /**

   This PPI provides a lightweight, read-only variant of the full EFI 

diff --git a/MdePkg/Include/Protocol/GuidedSectionExtaction.h b/MdePkg/Include/Protocol/GuidedSectionExtraction.h
index 55692e8..55692e8 100644
--- a/MdePkg/Include/Protocol/GuidedSectionExtaction.h
+++ b/MdePkg/Include/Protocol/GuidedSectionExtraction.h
diff --git a/MdePkg/Include/Protocol/SectionExtraction.h b/MdePkg/Include/Protocol/SectionExtraction.h
new file mode 100644
index 0000000..2210887
--- /dev/null
+++ b/MdePkg/Include/Protocol/SectionExtraction.h
@@ -0,0 +1,142 @@
+/** @file

+  This file declares Section Extraction protocol.

+

+  The section extraction protocol is referenced in the PI 1.0 specification, but

+  not defined. It will likely be added in an eratta update.

+

+  Copyright (c) 2006, Intel Corporation                                                         

+  All rights reserved. This program and the 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 __SECTION_EXTRACTION_PROTOCOL_H__

+#define __SECTION_EXTRACTION_PROTOCOL_H__

+

+

+

+typedef struct _EFI_SECTION_EXTRACTION_PROTOCOL EFI_SECTION_EXTRACTION_PROTOCOL;

+

+//

+// Protocol member functions

+//

+/**

+  Creates and returns a new section stream handle to represent the new section stream.

+

+  @param  This                  Indicates the EFI_SECTION_EXTRACTION_PROTOCOL instance.

+  @param  SectionStreamLength   Size in bytes of the section stream.

+  @param  SectionStream         Buffer containing the new section stream.

+  @param  SectionStreamHandle   A pointer to a caller-allocated UINTN that,

+                                on output, contains the new section stream handle.

+

+  @retval EFI_SUCCESS           The SectionStream was successfully processed and

+                                the section stream handle was returned.

+  @retval EFI_OUT_OF_RESOURCES  The system has insufficient resources to

+                                process the request.

+  @retval EFI_INVALID_PARAMETER The section stream may be corrupt or the value

+                                of SectionStreamLength may be incorrect.

+

+**/

+typedef

+EFI_STATUS

+(EFIAPI *EFI_OPEN_SECTION_STREAM) (

+  IN  EFI_SECTION_EXTRACTION_PROTOCOL                   *This,

+  IN  UINTN                                             SectionStreamLength,

+  IN  VOID                                              *SectionStream,

+  OUT UINTN                                             *SectionStreamHandle

+  );

+

+/**

+  Reads and returns a single section from a section stream.

+

+  @param  This                  Indicates the EFI_SECTION_EXTRACTION_PROTOCOL instance.

+  @param  SectionStreamHandle   Indicates from which section stream to read.

+  @param  SectionType           Pointer to an EFI_SECTION_TYPE.

+  @param  SectionDefinitionGuid Pointer to an EFI_GUID.If SectionType ==

+                                EFI_SECTION_GUID_DEFINED, SectionDefinitionGuid indicates what section GUID

+                                to search for.If SectionType !=EFI_SECTION_GUID_DEFINED, then

+                                SectionDefinitionGuid is unused and is ignored.

+  @param  SectionInstance       Indicates which instance of the requested section

+                                type to return when SectionType is not NULL.

+  @param  SectionStreamHandle   A pointer to a caller-allocated UINTN that, on output,

+                                contains the new section stream handle.

+  @param  Buffer                Pointer to a pointer to a buffer in which the section

+                                contents are returned.

+  @param  BufferSize            Pointer to a caller-allocated UINTN.

+  @param  AuthenticationStatus  Pointer to a caller-allocated UINT32 in

+                                which any meta-data from encapsulation GUID-defined sections is returned.

+

+  @retval EFI_SUCCESS           The SectionStream was successfully processed and

+                                the section contents were returned in Buffer.

+  @retval EFI_PROTOCOL_ERROR    A GUID-defined section was encountered in

+                                the section stream with its EFI_GUIDED_SECTION_PROCESSING_REQUIRED bit set,

+                                but there was no corresponding GUIDed Section Extraction Protocol in

+                                the handle database.

+  @retval EFI_NOT_FOUND         An error was encountered when parsing the SectionStream,

+                                which indicates that the SectionStream is not correctly formatted.

+                                Or The requested section does not exist.

+  @retval EFI_OUT_OF_RESOURCES  The system has insufficient resources to process

+                                the request.

+  @retval EFI_INVALID_PARAMETER The SectionStreamHandle does not exist.

+  @retval EFI_BUFFER_TOO_SMALL  The size of the input buffer is insufficient to

+                                contain the requested section.

+

+**/

+typedef

+EFI_STATUS

+(EFIAPI *EFI_GET_SECTION) (

+  IN EFI_SECTION_EXTRACTION_PROTOCOL                    *This,

+  IN UINTN                                              SectionStreamHandle,

+  IN EFI_SECTION_TYPE                                   *SectionType,

+  IN EFI_GUID                                           *SectionDefinitionGuid,

+  IN UINTN                                              SectionInstance,

+  IN VOID                                               **Buffer,

+  IN OUT UINTN                                          *BufferSize,

+  OUT UINT32                                            *AuthenticationStatus

+  );

+

+/**

+  Deletes a section stream handle and returns all associated resources to the system.

+

+  @param  This                  Indicates the EFI_SECTION_EXTRACTION_PROTOCOL instance.

+  @param  SectionStreamHandle   Indicates the section stream to close.

+  @retval EFI_SUCCESS           The SectionStream was successfully processed and

+                                the section stream handle was returned.

+  @retval EFI_INVALID_PARAMETER The SectionStreamHandle does not exist.

+

+**/

+typedef

+EFI_STATUS

+(EFIAPI *EFI_CLOSE_SECTION_STREAM) (

+  IN EFI_SECTION_EXTRACTION_PROTOCOL                    *This,

+  IN UINTN                                              SectionStreamHandle

+  );

+

+/**

+  @par Protocol Description:

+  The Section Extraction Protocol provides a simple method of extracting 

+  sections from arbitrarily complex files.

+

+  @param OpenSectionStream

+  Takes a bounded stream of sections and returns a section stream handle. 

+

+  @param GetSection

+  Given a section stream handle, retrieves the requested section and 

+  meta-data from the section stream. 

+

+  @param CloseSectionStream

+  Given a section stream handle, closes the section stream.

+

+**/

+struct _EFI_SECTION_EXTRACTION_PROTOCOL {

+  EFI_OPEN_SECTION_STREAM   OpenSectionStream;

+  EFI_GET_SECTION           GetSection;

+  EFI_CLOSE_SECTION_STREAM  CloseSectionStream;

+};

+

+#endif

diff --git a/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf b/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf
index 3cc3f59..11d4a0c 100644
--- a/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf
+++ b/MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf
@@ -63,15 +63,6 @@
 

 ################################################################################

 #

-# Includes Section - list of Include locations that are required for

-#                    this module.

-#

-################################################################################

-

-[Includes]

-

-################################################################################

-#

 # Package Dependency Section - list of Package files that are required for

 #                              this module.

 #

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 9669aa6..5c2f7a7 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -315,6 +315,10 @@
   PcdPciExpressBaseAddress|0x0000000a|gEfiMdePkgTokenSpaceGuid|UINT64|0xE0000000

   PcdFSBClock|0x0000000c|gEfiMdePkgTokenSpaceGuid|UINT32|200000000

   PcdUefiLibMaxPrintBufferSize|0x101|gEfiMdePkgTokenSpaceGuid|UINT32|320

+  PcdStatusCodeValueEfiWatchDogTimerExpired|0x0000000d|gEfiMdePkgTokenSpaceGuid|UINT32|0x00011003   # EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED

+  PcdStatusCodeValueSetVirtualAddressMap|0x0000000e|gEfiMdePkgTokenSpaceGuid|UINT32|0x03101004      # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP

+  PcdStatusCodeValueMemoryTestStarted|0x0000000f|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051006         # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST

+  PcdStatusCodeValueUncorrectableMemoryError|0x00000010|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051003  # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE

 

 [PcdsPatchableInModule.common]

   PcdDebugPrintErrorLevel|0x00000006|gEfiMdePkgTokenSpaceGuid|UINT32|0x80000000