X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkPkg%2FIntelFrameworkPkg.dec;h=8cefa10118133a9b00e4c259a8a4a06b40c2fdd2;hp=f1a452d038382d31745c46436561e39e6d4624b2;hb=f33d5d68abc02727dc828c1079e72ab65e1d63af;hpb=738508648fe2f720ddead052f37aa68dd2c87b07

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index f1a452d038..8cefa10118 100644
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -1,30 +1,27 @@
-#/** @file
+## @file
 # Intel Framework Package Reference Implementations
 #
 # This package provides definitions and libraries that comply to Intel Framework Specifications.
-# Copyright (c) 2007 - 2009, Intel Corporation.
+# Copyright (c) 2007 - 2018, Intel Corporation. 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.
 #
-#**/
+##
 
 [Defines]
   DEC_SPECIFICATION              = 0x00010005
   PACKAGE_NAME                   = IntelFrameworkPkg
+  PACKAGE_UNI_FILE               = IntelFrameworkPkg.uni
   PACKAGE_GUID                   = 2759ded5-bb57-4b06-af4f-c398fa552719
-  PACKAGE_VERSION                = 0.90
+  PACKAGE_VERSION                = 0.96
 
 [Includes]
   Include                        # Root include for the package
 
-[LibraryClasses]
-  SmmLib|Include/Library/SmmLib.h
-
 [Guids]
   ## Include/Guid/DataHubRecords.h
   gEfiCacheSubClassGuid          = { 0x7f0013a7, 0xdc79, 0x4b22, { 0x80, 0x99, 0x11, 0xf7, 0x5f, 0xdc, 0x82, 0x9d }}
@@ -54,11 +51,39 @@
   gEfiFirmwareFileSystemGuid     = { 0x7A9354D9, 0x0468, 0x444a, {0x81, 0xCE, 0x0B, 0xF6, 0x17, 0xD8, 0x90, 0xDF }}
 
   ## Include/Guid/BlockIo.h
-  gEfiPeiIdeBlockIoPpiGuid       = { 0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b }}
+  gEfiPeiIdeBlockIoPpiGuid       = { 0x964e5b22, 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 }}
 
+[Ppis]
+  ## Include/Ppi/BootScriptExecuter.h
+  gEfiPeiBootScriptExecuterPpiGuid  = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff }}
+
+  ## Include/Ppi/Security.h
+  gEfiPeiSecurityPpiGuid            = { 0x1388066E, 0x3A57, 0x4EFA, { 0x98, 0xF3, 0xC1, 0x2F, 0x3A, 0x95, 0x8A, 0x29 }}
+
+  ## Include/Ppi/Smbus.h
+  gEfiPeiSmbusPpiGuid               = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xda }}
+
+  ## Include/Ppi/PciCfg.h
+  gEfiPciCfgPpiInServiceTableGuid   = { 0xe1f2eba0, 0xf7b9, 0x4a26, { 0x86, 0x20, 0x13, 0x12, 0x21, 0x64, 0x2a, 0x90 }}
+
+  ## Include/Ppi/ReadOnlyVariable.h
+  gEfiPeiReadOnlyVariablePpiGuid    = { 0x3CDC90C6, 0x13FB, 0x4A75, { 0x9E, 0x79, 0x59, 0xE9, 0xDD, 0x78, 0xB9, 0xFA }}
+
+  ## Include/Ppi/SectionExtraction.h
+  gEfiPeiSectionExtractionPpiGuid   = { 0x4F89E208, 0xE144, 0x4804, { 0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7 }}
+
+  ## Include/Ppi/FvLoadFile.h
+  gEfiPeiFvFileLoaderPpiGuid        = { 0x7e1f0d85, 0x4ff,  0x4bb2, { 0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8 }}
+
+  ## Include/Ppi/FindFv.h
+  gEfiFindFvPpiGuid                 = { 0x36164812, 0xa023, 0x44e5, { 0xbd, 0x85, 0x05, 0xbf, 0x3c, 0x77, 0x00, 0xaa }}
+
+  ## Include/Ppi/S3Resume.h
+  gEfiPeiS3ResumePpiGuid            = { 0x4426CCB2, 0xE684, 0x4a8a, { 0xae, 0x40, 0x20, 0xd4, 0xb0, 0x25, 0xb7, 0x10 }}
+
 [Protocols]
   ## Include/Protocol/AcpiS3Save.h
   gEfiAcpiS3SaveProtocolGuid     = { 0x125F2DE1, 0xFB85, 0x440C, { 0xA5, 0x4C, 0x4D, 0x99, 0x35, 0x8A, 0x8D, 0x38 }}
@@ -138,8 +163,8 @@
   ## Include/Protocol/SmmIchnDispatch.h
   gEfiSmmIchnDispatchProtocolGuid = { 0xc50b323e, 0x9075, 0x4f2a, { 0xac, 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc }}
 
-  ## Include/Protocol/SmmStatusCode.h
-  gEfiSmmStatusCodeProtocolGuid = { 0x6afd2b77, 0x98c1, 0x4acd, {0xa6, 0xf9, 0x8a, 0x94, 0x39, 0xde, 0xf, 0xb1 }}
+  ## Include/Protocol/SmmCpuIo.h
+  gEfiSmmCpuIoGuid  = { 0x5f439a0b, 0x45d8, 0x4682, {0xa4, 0xf4, 0xf0, 0x57, 0x6b, 0x51, 0x34, 0x41}}
 
   ## Include/Protocol/FrameworkFormCallback.h
   gEfiFormCallbackProtocolGuid   = { 0xF3E4543D, 0xCF35, 0x6CEF, { 0x35, 0xC4, 0x4F, 0xE6, 0x34, 0x4D, 0xFC, 0x54 }}
@@ -150,27 +175,12 @@
   ## Include/Protocol/FrameworkFormBrowser.h
   gEfiFormBrowserCompatibilityProtocolGuid    = { 0xfb7c852, 0xadca, 0x4853, { 0x8d, 0xf, 0xfb, 0xa7, 0x1b, 0x1c, 0xe1, 0x1a }}
 
-[Ppis]
-  ## Include/Ppi/BootScriptExecuter.h
-  gEfiPeiBootScriptExecuterPpiGuid = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff }}
-
-  ## Include/Ppi/Security.h
-  gEfiPeiSecurityPpiGuid         = { 0x1388066E, 0x3A57, 0x4EFA, { 0x98, 0xF3, 0xC1, 0x2F, 0x3A, 0x95, 0x8A, 0x29 }}
-
-  ## Include/Ppi/Smbus.h
-  gEfiPeiSmbusPpiGuid            = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xda }}
-
-  ## Include/Ppi/PciCfg.h
-  gEfiPciCfgPpiInServiceTableGuid = { 0xe1f2eba0, 0xf7b9, 0x4a26, {0x86, 0x20, 0x13, 0x12, 0x21, 0x64, 0x2a, 0x90 }}
-
-  ## Include/Ppi/ReadOnlyVariable.h
-  gEfiPeiReadOnlyVariablePpiGuid = { 0x3CDC90C6, 0x13FB, 0x4A75, { 0x9E, 0x79, 0x59, 0xE9, 0xDD, 0x78, 0xB9, 0xFA }}
+  ## Include/Protocol/FrameworkFirmwareVolumeBlock.h
+  gFramerworkEfiFirmwareVolumeBlockProtocolGuid = { 0xDE28BC59, 0x6228, 0x41BD, { 0xBD, 0xF6, 0xA3, 0xB9, 0xAD, 0xB5, 0x8D, 0xA1 }}
 
-  ## Include/Ppi/SectionExtraction.h
-  gEfiPeiSectionExtractionPpiGuid = { 0x4F89E208, 0xE144, 0x4804, { 0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7 }}
+  ## Include/Protocol/SmmCpuSaveState.h
+  gEfiSmmCpuSaveStateProtocolGuid = { 0x21f302ad, 0x6e94, 0x471b, {0x84, 0xbc, 0xb1, 0x48, 0x0, 0x40, 0x3a, 0x1d}}
 
-  ## Include/Ppi/FvLoadFile.h
-  gEfiPeiFvFileLoaderPpiGuid     = { 0x7e1f0d85, 0x4ff, 0x4bb2, {0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8 }}
 
-  ## Include/Ppi/FindFv.h
-  gEfiFindFvPpiGuid              = { 0x36164812, 0xa023, 0x44e5, { 0xbd, 0x85, 0x05, 0xbf, 0x3c, 0x77, 0x00, 0xaa }}
+[UserExtensions.TianoCore."ExtraFiles"]
+  IntelFrameworkPkgExtra.uni