1) Move gEfiStatusCodeDataTypeDebugGuid from the IntelFrameworkPkg to the IntelFrameworkModulePkg. This GUID is not defined in the Framework Specifications, so it is part of the implementation. This GUID is used to pass DEBUG() information to the Status Code Protocol and PPI. This GUID is now defined in IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h. The GUID definition was also moved from the DEC file in the IntelFrameworkPkg to the IntelFrameworkModulePkg.

2) Move data structure use to pass DEBUG() info to Status Code Protocol and Status Code PPI from IntelFrameworkModulePkg.Include/DebugInfo.h into the new GUID file IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h

3) Delete IntelFrameworkModulePkg/Include/DebugInfo.h because all the content is now in IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h

Module Impacts
==============
1) Modules that currently use #include <DebugInfo.h> must be updated to #include <Guid/StatusCodeDataTypeDebug.h>.  
2) Modules that currently use #include <Guid/StatusCodeDataTypeId.h> and don't #include <DebugInfo.h> will have to add #include <Guid/StatusCodeDataTypeDebug.h>.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8431 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney 2009-06-01 21:17:41 +00:00
parent cdf360f8e4
commit 3a6064fa3b
9 changed files with 47 additions and 38 deletions

View File

@ -1,32 +0,0 @@
/** @file
Include file for EFI_DEBUG_INFO
Copyright (c) 2006 - 2007, 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 _MAX_BBS_ENTRIES_H_
#define _MAX_BBS_ENTRIES_H_
#pragma pack(1)
typedef struct {
UINT32 ErrorLevel;
//
// 12 * sizeof (UINT64) Var Arg stack
//
// ascii DEBUG () Format string
//
} EFI_DEBUG_INFO;
#pragma pack()
#endif

View File

@ -0,0 +1,37 @@
/** @file
GUID used to pass DEBUG() macro information through the Status Code Protocol
and Status Code PPI
Copyright (c) 2007, 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_
//
// Debug DataType defintions.
//
#define EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID \
{ 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9 } }
typedef struct {
UINT32 ErrorLevel;
//
// 12 * sizeof (UINT64) Var Arg stack
//
// ascii DEBUG () Format string
//
} EFI_DEBUG_INFO;
extern EFI_GUID gEfiStatusCodeDataTypeDebugGuid;
#endif // _STATUS_CODE_DATA_TYPE_DEBUG_H_

View File

@ -62,6 +62,10 @@
## Include/Guid/ShellFile.h
gEfiShellFileGuid = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}
## 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 }}
## Guid for EFI_DISK_INFO_PROTOCOL.Interface to specify Usb interface.
## Include/Protocol/DiskInfo.h

View File

@ -27,10 +27,10 @@
#include <Library/DevicePathLib.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h>
#include <Protocol/StatusCode.h>
#include <FrameworkModuleBase.h>
#include <DebugInfo.h>
extern EFI_REPORT_STATUS_CODE mReportStatusCode;

View File

@ -17,6 +17,7 @@
#include <FrameworkPei.h>
#include <FrameworkModuleBase.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h>
#include <Library/DebugLib.h>
#include <Library/BaseLib.h>
@ -24,8 +25,6 @@
#include <Library/ReportStatusCodeLib.h>
#include <Library/PcdLib.h>
#include <DebugInfo.h>
/**
Prints a debug message to the debug output device if the specified error level is enabled.

View File

@ -16,6 +16,7 @@
#include <FrameworkPei.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h>
#include <Library/ReportStatusCodeLib.h>
#include <Library/DebugLib.h>
@ -25,8 +26,6 @@
#include <Library/OemHookStatusCodeLib.h>
#include <Library/PcdLib.h>
#include <DebugInfo.h>
//
// Define the maximum extended data size that is supported in the PEI phase
//

View File

@ -27,11 +27,11 @@
#include <Library/DevicePathLib.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h>
#include <Guid/EventGroup.h>
#include <Protocol/StatusCode.h>
#include <FrameworkModuleBase.h>
#include <DebugInfo.h>
extern EFI_REPORT_STATUS_CODE mReportStatusCode;

View File

@ -19,6 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Guid/DataHubStatusCodeRecord.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h>
#include <Protocol/DataHub.h>
#include <Protocol/SimpleTextOut.h>

View File

@ -24,6 +24,7 @@
#include <Guid/MemoryStatusCodeRecord.h>
#include <Protocol/StatusCode.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h>
#include <Guid/EventGroup.h>
#include <Library/BaseLib.h>