Remove status code modules' dependency on IntelFrameworkModulePkg.

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

IntelFrameworkModulePkg/Include/Guid/MemoryStatusCodeRecord.h

@@ -1,83 +0,0 @@
-/** @file
-  GUID used to identify status code records HOB that originate from the PEI status code    
-  
-  Copyright (c) 2006 - 2009, Intel Corporation                                                         
-  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 __MEMORY_STATUS_CODE_RECORD_H__
-#define __MEMORY_STATUS_CODE_RECORD_H__
-
-///
-/// Global ID used to identify GUIDed HOBs that start with a structure of type 
-/// MEMORY_STATUSCODE_PACKET_HEADER followed by an array of structures of type 
-/// MEMORY_STATUSCODE_RECORD.  These GUIDed HOBs record all the information 
-/// passed into the ReportStatusCode() service of PEI Services Table.
-///
-///  <pre>
-///  Memory status code records packet structure :
-///  +---------------+----------+----------+-----+----------+-----+----------+
-///  | Packet Header | Record 1 | Record 2 | ... + Record n | ... | Record m |
-///  +---------------+----------+----------+-----+----------+-----+----------+
-///                  ^                                 ^                     ^
-///                  +--------- RecordIndex -----------+                     |
-///                  +---------------- MaxRecordsNumber----------------------+
-///  </pre>
-///
-#define MEMORY_STATUS_CODE_RECORD_GUID \
-  { \
-    0x60cc026, 0x4c0d, 0x4dda, {0x8f, 0x41, 0x59, 0x5f, 0xef, 0x0, 0xa5, 0x2} \
-  }
-
-///
-/// A header structure that is followed by an array of records that contain the 
-/// parameters passed into the ReportStatusCode() service in the PEI Services Table.
-///
-typedef struct {
-  ///
-  /// Index of the packet
-  ///
-  UINT16  PacketIndex;
-  ///
-  /// The number of active records in the packet
-  ///
-  UINT16  RecordIndex;
-  ///
-  /// The maximum number of records that the packet can store
-  ///
-  UINT32  MaxRecordsNumber;
-} MEMORY_STATUSCODE_PACKET_HEADER;
-
-///
-/// A structure that contains the parameters passed into the ReportStatusCode() 
-/// service in the PEI Services Table.
-///
-typedef struct {
-  ///
-  /// Status Code type to be reported.
-  ///
-  EFI_STATUS_CODE_TYPE   CodeType;
-
-  ///
-  /// An operation, plus value information about the class and subclass, used to
-  /// classify the hardware and software entity.
-  ///
-  EFI_STATUS_CODE_VALUE  Value;
-
-  ///
-  /// The enumeration of a hardware or software entity within
-  /// the system. Valid instance numbers start with 1
-  ///
-  UINT32                 Instance;
-} MEMORY_STATUSCODE_RECORD;
-
-extern EFI_GUID gMemoryStatusCodeRecordGuid;
-
-#endif

IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h

@@ -1,49 +0,0 @@
-/** @file
-  This file defines the GUID and data structure used to pass DEBUG() macro 
-  information to the Status Code Protocol and Status Code PPI.
-
-  Copyright (c) 2007 - 2009, Intel Corporation
-  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 _STATUS_CODE_DATA_TYPE_DEBUG_H_
-#define _STATUS_CODE_DATA_TYPE_DEBUG_H_
-
-///
-/// Global ID used to identify a structure of type EFI_DEBUG_INFO
-///
-#define EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID \
-  { \
-    0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9 } \
-  }
-
-///
-/// The maximum size of an EFI_DEBUG_INFO structure
-///
-#define EFI_STATUS_CODE_DATA_MAX_SIZE 200
-
-///
-/// This structure contains the ErrorLevel passed into the DEBUG() macro, followed 
-/// by a 96-byte buffer that contains the variable argument list passed to the 
-//  DEBUG() macro that has been converted to a BASE_LIST.  The 96-byte buffer is 
-/// followed by a Null-terminated ASCII string that is the Format string passed 
-/// to the DEBUG() macro.  The maximum size of this structure is defined by 
-/// EFI_STATUS_CODE_DATA_MAX_SIZE.
-///
-typedef struct {
-  ///
-  /// The debug error level passed into a DEBUG() macro.
-  ///
-  UINT32  ErrorLevel;
-} EFI_DEBUG_INFO;
-
-extern EFI_GUID gEfiStatusCodeDataTypeDebugGuid;
-
-#endif // _STATUS_CODE_DATA_TYPE_DEBUG_H_

IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec

@@ -38,10 +38,6 @@
   #  Include/Guid/IntelFrameworkModulePkgTokenSpace.h
   gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}
 
-  ## GUID identifies status code records HOB that originate from the PEI status code
-  #  Include/Guid/MemoryStatusCodeRecord.h
-  gMemoryStatusCodeRecordGuid     = { 0x060CC026, 0x4C0D, 0x4DDA, { 0x8F, 0x41, 0x59, 0x5F, 0xEF, 0x00, 0xA5, 0x02 }}
-
   ## GUID identifies Data Hub records logged by Status Code Runtime Protocol.
   #  Include/Guid/DataHubStatusCodeRecord.h
   gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}
@@ -54,10 +50,6 @@
   #  Include/Guid/LzmaDecompress.h
   gLzmaCustomDecompressGuid      = { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF }}
 
-  ## GUID used to pass DEBUG() macro information through the Status Code Protocol and Status Code PPI
-  #  Include/Guid/StatusCodeDataTypeDebug.h
-  gEfiStatusCodeDataTypeDebugGuid  = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }}
-
 [Protocols]
   ## Vga Mini port binding for a VGA controller
   #  Include/Protocol/VgaMiniPort.h
@@ -80,22 +72,12 @@
   gEfiOEMBadgingProtocolGuid     = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}
 
 [PcdsFeatureFlag]
-  ## This PCD specifies whether StatusCode is reported via Serial port.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022
-
-  ## This PCD specifies whether StatusCode is stored in memory.
-  #  The memory is boot time memory in PEI Phase and is runtime memory in DXE Phase.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00010023
-
   ## This PCD specifies whether StatusCode is reported via OEM device.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|FALSE|BOOLEAN|0x00010024
 
   ## This PCD specifies whether StatusCode is loged into DataHub.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE|BOOLEAN|0x00010029
 
-  ## This PCD specifies whether Peiphase StatusCode is replayed in DxePhase.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn|FALSE|BOOLEAN|0x0001002d
-
   ## This PCD specifies whether Serial device use half hand shake.
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE|BOOLEAN|0x00010043
 
@@ -112,13 +94,6 @@
   #  BIT2 indicates if ISA memory is supported
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures|0x05|UINT8|0x00010040
 
-[PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]
-  ## PcdStatusCodeMemorySize is used when PcdStatusCodeUseMemory is set to true
-  #  (PcdStatusCodeMemorySize * KBytes) is the total taken memory size.
-  #  The default value in PeiPhase is 1 KBytes.
-  #  The default value in DxePhase is 128 KBytes.
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|UINT16|0x00010025
-
 [PcdsDynamic]
   ## PCD is used to mark if the machine has complete one boot cycle before.
   #  After the complete boot, the variable BootState will be set to TRUE.

IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc

@@ -136,7 +136,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE
 
 [PcdsFixedAtBuild.common]
@@ -159,10 +159,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0
 
 [PcdsDynamicDefault.PEIM.DEFAULT]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1
 
 [PcdsDynamicDefault.DXE_RUNTIME_DRIVER.DEFAULT]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|4
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|4
 
 [PcdsFixedAtBuild.IPF]
   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000

IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf

@@ -33,6 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 

IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

@@ -34,6 +34,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
   

IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf

@@ -37,6 +37,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 

IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/ReportStatusCodeLib.c

@@ -12,8 +12,6 @@
 
 **/
 
-#include <FrameworkDxe.h>
-
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/DebugLib.h>
 #include <Library/SmmServicesTableLib.h>

IntelFrameworkModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf

@@ -35,8 +35,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  IntelFrameworkPkg/IntelFrameworkPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
 [LibraryClasses]
   PcdLib

IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf

@@ -41,6 +41,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 

IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf

@@ -32,6 +32,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 

IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

@@ -37,6 +37,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
@@ -63,12 +64,12 @@
 
 [FeaturePcd.common]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
 
 
 [Pcd.common]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory
 
 [Depex]
   TRUE

IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

@@ -40,6 +40,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   IntelFrameworkPkg/IntelFrameworkPkg.dec
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
 
@@ -73,14 +74,14 @@
   gEfiDataHubProtocolGuid                       ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)
 
 [FeaturePcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory
 
 [Depex]
   TRUE

IntelFrameworkModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

@@ -35,7 +35,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
   PeimEntryPoint
@@ -54,11 +54,11 @@
   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES
 
 [FeaturePcd.common]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
 
 [Pcd.common]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory
 
 [Depex]
   gEfiPeiRscHandlerPpiGuid

IntelFrameworkModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

@@ -35,7 +35,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
   SerialPortLib
@@ -51,7 +51,6 @@
   SynchronizationLib
 
 [Guids]
-  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)
   gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB
   gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event
   gEfiEventExitBootServicesGuid                 ## CONSUMES ## Event
@@ -60,12 +59,12 @@
   gEfiRscHandlerProtocolGuid                    ## CONSUMES
 
 [FeaturePcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory
 
 [Depex]
   gEfiRscHandlerProtocolGuid

IntelFrameworkModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf

@@ -37,7 +37,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
   SerialPortLib
@@ -50,18 +50,17 @@
   SynchronizationLib
 
 [Guids]
-  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)
   gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB
 
 [Protocols]
   gEfiSmmRscHandlerProtocolGuid                 ## CONSUMES
 
 [FeaturePcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
 
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory
 
 [Depex]
   gEfiSmmRscHandlerProtocolGuid