Remove the following PPIs from the IntelFrameworkPkg because they were identical to PPIs from the PI 1.2 Specification

1) Block I/O PPI 
2) Device Recovery PPI 
3) Recovery Module PPI 
4) S3 Resume PPI 

Also add Include/Guid/BlockIo.h that contains two hardware device specific GUIDs for recovery devices that are only defined in the Framework Specifications



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

1 files changed, 11 insertions, 25 deletions

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index 82254e4..1a06fce 100644
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -19,14 +19,13 @@
   PACKAGE_GUID                   = 2759ded5-bb57-4b06-af4f-c398fa552719

   PACKAGE_VERSION                = 1.0

 

-

-[Includes.common]

+[Includes]

   Include                        # Root include for the package

 

-[LibraryClasses.common]

+[LibraryClasses]

   SmmLib|Include/Library/SmmLib.h

 

-[Guids.common]

+[Guids]

   ## EdkCompatibilityPkg/Foundation/Framework/Guid/AcpiTableStorage/AcpiTableStorage.h

   gEfiAcpiTableStorageGuid       = { 0x7e374e25, 0x8e01, 0x4fee, { 0x87, 0xf2, 0x39, 0x0c, 0x23, 0xc6, 0x06, 0xcd }}

   

@@ -63,7 +62,13 @@
   ## Include/Guid/FirmwareFileSystem.h

   gEfiFirmwareFileSystemGuid     = { 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}

 

-[Protocols.common]

+  ##   Include/Guid/BlockIo.h

+  gEfiPeiIdeBlockIoPpiGuid       = { 0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}

+  

+  ##  Include/Guid/BlockIo.h

+  gEfiPei144FloppyBlockIoPpiGuid = { 0xda6855bd, 0x07b7, 0x4c05, { 0x9e, 0xd8, 0xe2, 0x59, 0xfd, 0x36, 0x0e, 0x22 }}

+    

+[Protocols]

   ## Include/Protocol/AcpiS3Save.h

   gEfiAcpiS3SaveProtocolGuid     = { 0x125F2DE1, 0xFB85, 0x440C, { 0xA5, 0x4C, 0x4D, 0x99, 0x35, 0x8A, 0x8D, 0x38 }}

   

@@ -169,28 +174,10 @@
   ## Include/Protocol/FrameworkFormBrowser.h

   gEfiFormBrowserCompatibilityProtocolGuid    = { 0xfb7c852, 0xadca, 0x4853, { 0x8d, 0xf, 0xfb, 0xa7, 0x1b, 0x1c, 0xe1, 0x1a }}

 

-[Ppis.common]

+[Ppis]

   ## Include/Ppi/BootScriptExecuter.h

   gEfiPeiBootScriptExecuterPpiGuid = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff }}

   

-  ## Include/Ppi/RecoveryModule.h

-  gEfiPeiRecoveryModulePpiGuid   = { 0xFB6D9542, 0x612D, 0x4f45, { 0x87, 0x2f, 0x5c, 0xff, 0x52, 0xe9, 0x3d, 0xcf }}

-  

-  ## Include/Ppi/DeviceRecoveryModule.h

-  gEfiPeiDeviceRecoveryModulePpiGuid = {0x0DE2CE25, 0x446A, 0x45a7, {0xBF, 0xC9, 0x37, 0xDA, 0x26, 0x34, 0x4B, 0x37 }}

-  

-  ## Include/Ppi/BlockIo.h

-  gEfiPeiVirtualBlockIoPpiGuid   = { 0x695d8aa1, 0x42ee, 0x4c46, { 0x80, 0x5c, 0x6e, 0xa6, 0xbc, 0xe7, 0x99, 0xe3 }}

-  

-  ##  Include/Ppi/BlockIo.h

-  gEfiPei144FloppyBlockIoPpiGuid = { 0xda6855bd, 0x07b7, 0x4c05, { 0x9e, 0xd8, 0xe2, 0x59, 0xfd, 0x36, 0x0e, 0x22 }}

-  

-  ##   Include/Ppi/BlockIo.h

-  gEfiPeiIdeBlockIoPpiGuid       = { 0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}

-  

-  ## Include/Ppi/S3Resume.h

-  gEfiPeiS3ResumePpiGuid         = { 0x4426CCB2, 0xE684, 0x4a8a, { 0xae, 0x40, 0x20, 0xd4, 0xb0, 0x25, 0xb7, 0x10 }}

-  

   ## Include/Ppi/Security.h

   gEfiPeiSecurityPpiGuid         = { 0x1388066E, 0x3A57, 0x4EFA, { 0x98, 0xF3, 0xC1, 0x2F, 0x3A, 0x95, 0x8A, 0x29 }}

   

@@ -211,4 +198,3 @@
   

   ## Include/Ppi/FindFv.h

   gEfiFindFvPpiGuid              = { 0x36164812, 0xa023, 0x44e5, { 0xbd, 0x85, 0x05, 0xbf, 0x3c, 0x77, 0x00, 0xaa }}

-