sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove extra #includes where possible to make build more efficient

Browse Source 
If module really is a Framework module and not a PI module, then use FrameworkDxe.h instead of PeDxe.h and FrameworkPei.h instead of PiPei.h



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8902 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney
2009-07-11 23:29:23 +00:00
parent 7075f41227
commit bac49e7747
7 changed files with 315 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
UnixPkg/CpuRuntimeDxe/Cpu.c
View File

@ -21,7 +21,7 @@ Abstract:
in this driver. in this driver.
--*/ --*/
#include "PiDxe.h" #include <FrameworkDxe.h>
#include <Protocol/Cpu.h> #include <Protocol/Cpu.h>
#include <Protocol/DataHub.h> #include <Protocol/DataHub.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>
@ -36,7 +36,6 @@ Abstract:
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/UefiBootServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>
#include <Framework/DataHubRecords.h>
#include "CpuDriver.h" #include "CpuDriver.h"
#include "UnixDxe.h" #include "UnixDxe.h"
#include <Protocol/UnixIo.h> #include <Protocol/UnixIo.h>

2
UnixPkg/CpuRuntimeDxe/CpuIo.c
View File

@ -22,7 +22,7 @@ Abstract:
Bridge I/O Protocol. Bridge I/O Protocol.
--*/ --*/
#include "PiDxe.h" #include <FrameworkDxe.h>
#include <Protocol/Cpu.h> #include <Protocol/Cpu.h>
#include <Protocol/DataHub.h> #include <Protocol/DataHub.h>
#include <Guid/DataHubRecords.h> #include <Guid/DataHubRecords.h>

2
UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
View File

@ -13,7 +13,7 @@
Module Name: UnixOemHookStatusCodeLib.c Module Name: UnixOemHookStatusCodeLib.c
**/ **/
#include "PiDxe.h" #include <FrameworkDxe.h>
#include <Guid/StatusCodeDataTypeId.h> #include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h> #include <Guid/StatusCodeDataTypeDebug.h>
#include "UnixDxe.h" #include "UnixDxe.h"

162
UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c
View File

@ -1,59 +1,59 @@
/**@file /**@file
Copyright (c) 2006 - 2009, Intel Corporation Copyright (c) 2006 - 2009, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name: Module Name:
PeiUnixPeCoffExtraActionLib.c PeiUnixPeCoffExtraActionLib.c
Abstract: Abstract:
Provides services to perform additional actions to relocate and unload Provides services to perform additional actions to relocate and unload
PE/Coff image for Unix environment specific purpose such as souce level debug. PE/Coff image for Unix environment specific purpose such as souce level debug.
This version only works for DXE phase This version only works for DXE phase
**/ **/
#include <PiDxe.h> #include <FrameworkDxe.h>
#include <Guid/StatusCodeDataTypeId.h> #include <Guid/StatusCodeDataTypeId.h>
#include <UnixDxe.h> #include <UnixDxe.h>
#include <Library/PeCoffLib.h> #include <Library/PeCoffLib.h>
#include <Library/PeiServicesLib.h> #include <Library/PeiServicesLib.h>
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/HobLib.h> #include <Library/HobLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/PeCoffExtraActionLib.h> #include <Library/PeCoffExtraActionLib.h>
// //
// Cache of UnixThunk protocol // Cache of UnixThunk protocol
// //
EFI_UNIX_THUNK_PROTOCOL *mUnix; EFI_UNIX_THUNK_PROTOCOL *mUnix;
/** /**
The constructor function gets the pointer of the WinNT thunk functions The constructor function gets the pointer of the WinNT thunk functions
It will ASSERT() if Unix thunk protocol is not installed. It will ASSERT() if Unix thunk protocol is not installed.
@retval EFI_SUCCESS Unix thunk protocol is found and cached. @retval EFI_SUCCESS Unix thunk protocol is found and cached.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
DxeUnixPeCoffLibExtraActionConstructor ( DxeUnixPeCoffLibExtraActionConstructor (
IN EFI_HANDLE ImageHandle, IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable IN EFI_SYSTEM_TABLE *SystemTable
) )
{ {
EFI_HOB_GUID_TYPE *GuidHob; EFI_HOB_GUID_TYPE *GuidHob;
// //
@ -64,32 +64,32 @@ DxeUnixPeCoffLibExtraActionConstructor (
mUnix = (EFI_UNIX_THUNK_PROTOCOL *)(*(UINTN *)(GET_GUID_HOB_DATA (GuidHob))); mUnix = (EFI_UNIX_THUNK_PROTOCOL *)(*(UINTN *)(GET_GUID_HOB_DATA (GuidHob)));
ASSERT (mUnix != NULL); ASSERT (mUnix != NULL);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/** /**
Performs additional actions after a PE/COFF image has been loaded and relocated. Performs additional actions after a PE/COFF image has been loaded and relocated.
If ImageContext is NULL, then ASSERT(). If ImageContext is NULL, then ASSERT().
@param ImageContext Pointer to the image context structure that describes the @param ImageContext Pointer to the image context structure that describes the
PE/COFF image that has already been loaded and relocated. PE/COFF image that has already been loaded and relocated.
**/ **/
VOID VOID
EFIAPI EFIAPI
PeCoffLoaderRelocateImageExtraAction ( PeCoffLoaderRelocateImageExtraAction (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
) )
{ {
VOID * Handle; VOID * Handle;
VOID * Entry; VOID * Entry;
ASSERT (ImageContext != NULL); ASSERT (ImageContext != NULL);
Handle = NULL; Handle = NULL;
Entry = NULL; Entry = NULL;
DEBUG ((EFI_D_ERROR, "Loading %a 0x%08lx - entry point 0x%08lx\n", DEBUG ((EFI_D_ERROR, "Loading %a 0x%08lx - entry point 0x%08lx\n",
ImageContext->PdbPointer, ImageContext->PdbPointer,
(UINTN)ImageContext->ImageAddress, (UINTN)ImageContext->ImageAddress,
@ -99,20 +99,20 @@ PeCoffLoaderRelocateImageExtraAction (
if (Handle) { if (Handle) {
Entry = mUnix->Dlsym(Handle, "_ModuleEntryPoint"); Entry = mUnix->Dlsym(Handle, "_ModuleEntryPoint");
} else { } else {
DEBUG ((EFI_D_ERROR, "%a\n", mUnix->Dlerror())); DEBUG ((EFI_D_ERROR, "%a\n", mUnix->Dlerror()));
} }
if (Entry != NULL) { if (Entry != NULL) {
ImageContext->EntryPoint = Entry; ImageContext->EntryPoint = Entry;
DEBUG ((EFI_D_ERROR, "Change %a Entrypoint to :0x%08lx\n", ImageContext->PdbPointer, Entry)); DEBUG ((EFI_D_ERROR, "Change %a Entrypoint to :0x%08lx\n", ImageContext->PdbPointer, Entry));
} }
return; return;
} }
/** /**
Performs additional actions just before a PE/COFF image is unloaded. Any resources Performs additional actions just before a PE/COFF image is unloaded. Any resources
that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed. that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.
@ -120,13 +120,13 @@ PeCoffLoaderRelocateImageExtraAction (
@param ImageContext Pointer to the image context structure that describes the @param ImageContext Pointer to the image context structure that describes the
PE/COFF image that is being unloaded. PE/COFF image that is being unloaded.
**/ **/
VOID VOID
EFIAPI EFIAPI
PeCoffLoaderUnloadImageExtraAction ( PeCoffLoaderUnloadImageExtraAction (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
) )
{ {
ASSERT (ImageContext != NULL); ASSERT (ImageContext != NULL);
} }

460
UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
View File

@ -1,231 +1,231 @@
/** @file /** @file
OEM hook status code library functions with no library constructor/destructor OEM hook status code library functions with no library constructor/destructor
Copyright (c) 2006 - 2008, Intel Corporation Copyright (c) 2006 - 2008, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name: UnixOemHookStatusCodeLib.c Module Name: UnixOemHookStatusCodeLib.c
**/ **/
#include "PiPei.h" #include <FrameworkPei.h>
#include <Guid/StatusCodeDataTypeId.h> #include <Guid/StatusCodeDataTypeId.h>
#include <Guid/StatusCodeDataTypeDebug.h> #include <Guid/StatusCodeDataTypeDebug.h>
#include <Ppi/UnixThunk.h> #include <Ppi/UnixThunk.h>
#include <Library/OemHookStatusCodeLib.h> #include <Library/OemHookStatusCodeLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/PrintLib.h> #include <Library/PrintLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/ReportStatusCodeLib.h> #include <Library/ReportStatusCodeLib.h>
#include <Library/PeiServicesLib.h> #include <Library/PeiServicesLib.h>
// //
// Cache of UnixThunk protocol // Cache of UnixThunk protocol
// //
EFI_UNIX_THUNK_PROTOCOL *mUnix; EFI_UNIX_THUNK_PROTOCOL *mUnix;
// //
// Cache of standard output handle . // Cache of standard output handle .
// //
int mStdOut; int mStdOut;
/** /**
Initialize OEM status code device . Initialize OEM status code device .
@return Always return EFI_SUCCESS. @return Always return EFI_SUCCESS.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
OemHookStatusCodeInitialize ( OemHookStatusCodeInitialize (
VOID VOID
) )
{ {
PEI_UNIX_THUNK_PPI *UnixThunkPpi; PEI_UNIX_THUNK_PPI *UnixThunkPpi;
EFI_STATUS Status; EFI_STATUS Status;
// //
// Locate Unix ThunkPpi for retrieving standard output handle // Locate Unix ThunkPpi for retrieving standard output handle
// //
Status = PeiServicesLocatePpi ( Status = PeiServicesLocatePpi (
&gPeiUnixThunkPpiGuid, &gPeiUnixThunkPpiGuid,
0, 0,
NULL, NULL,
(VOID **) &UnixThunkPpi (VOID **) &UnixThunkPpi
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
mUnix = (EFI_UNIX_THUNK_PROTOCOL *) UnixThunkPpi->UnixThunk (); mUnix = (EFI_UNIX_THUNK_PROTOCOL *) UnixThunkPpi->UnixThunk ();
// //
// Cache standard output handle. // Cache standard output handle.
// //
mStdOut = 1; mStdOut = 1;
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/** /**
Report status code to OEM device. Report status code to OEM device.
@param CodeType Indicates the type of status code being reported. Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below. @param CodeType Indicates the type of status code being reported. Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.
@param Value Describes the current status of a hardware or software entity. @param Value Describes the current status of a hardware or software entity.
This included information about the class and subclass that is used to classify the entity This included information about the class and subclass that is used to classify the entity
as well as an operation. For progress codes, the operation is the current activity. as well as an operation. For progress codes, the operation is the current activity.
For error codes, it is the exception. For debug codes, it is not defined at this time. For error codes, it is the exception. For debug codes, it is not defined at this time.
Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below. Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.
Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification. Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.
@param Instance The enumeration of a hardware or software entity within the system. @param Instance The enumeration of a hardware or software entity within the system.
A system may contain multiple entities that match a class/subclass pairing. A system may contain multiple entities that match a class/subclass pairing.
The instance differentiates between them. An instance of 0 indicates that instance information is unavailable, The instance differentiates between them. An instance of 0 indicates that instance information is unavailable,
not meaningful, or not relevant. Valid instance numbers start with 1. not meaningful, or not relevant. Valid instance numbers start with 1.
@param CallerId This optional parameter may be used to identify the caller. @param CallerId This optional parameter may be used to identify the caller.
This parameter allows the status code driver to apply different rules to different callers. This parameter allows the status code driver to apply different rules to different callers.
Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification. Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
@param Data This optional parameter may be used to pass additional data @param Data This optional parameter may be used to pass additional data
@return The function always return EFI_SUCCESS. @return The function always return EFI_SUCCESS.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
OemHookStatusCodeReport ( OemHookStatusCodeReport (
IN EFI_STATUS_CODE_TYPE CodeType, IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value, IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance, IN UINT32 Instance,
IN EFI_GUID *CallerId, OPTIONAL IN EFI_GUID *CallerId, OPTIONAL
IN EFI_STATUS_CODE_DATA *Data OPTIONAL IN EFI_STATUS_CODE_DATA *Data OPTIONAL
) )
{ {
CHAR8 *Filename; CHAR8 *Filename;
CHAR8 *Description; CHAR8 *Description;
CHAR8 *Format; CHAR8 *Format;
CHAR8 Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE]; CHAR8 Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];
UINT32 ErrorLevel; UINT32 ErrorLevel;
UINT32 LineNumber; UINT32 LineNumber;
UINTN CharCount; UINTN CharCount;
BASE_LIST Marker; BASE_LIST Marker;
Buffer[0] = '\0'; Buffer[0] = '\0';
if (Data != NULL && if (Data != NULL &&
ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) { ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {
// //
// Print ASSERT() information into output buffer. // Print ASSERT() information into output buffer.
// //
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
sizeof (Buffer), sizeof (Buffer),
"\n\rASSERT!: %a (%d): %a\n\r", "\n\rASSERT!: %a (%d): %a\n\r",
Filename, Filename,
LineNumber, LineNumber,
Description Description
); );
// //
// Callout to standard output. // Callout to standard output.
// //
mUnix->Write ( mUnix->Write (
mStdOut, mStdOut,
Buffer, Buffer,
CharCount CharCount
); );
return EFI_SUCCESS; return EFI_SUCCESS;
} else if (Data != NULL && } else if (Data != NULL &&
ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) { ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {
// //
// Print DEBUG() information into output buffer. // Print DEBUG() information into output buffer.
// //
CharCount = AsciiBSPrint ( CharCount = AsciiBSPrint (
Buffer, Buffer,
sizeof (Buffer), sizeof (Buffer),
Format, Format,
Marker Marker
); );
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) { } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
// //
// Print ERROR information into output buffer. // Print ERROR information into output buffer.
// //
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
sizeof (Buffer), sizeof (Buffer),
"ERROR: C%x:V%x I%x", "ERROR: C%x:V%x I%x",
CodeType, CodeType,
Value, Value,
Instance Instance
); );
// //
// Make sure we don't try to print values that weren't intended to be printed, especially NULL GUID pointers. // Make sure we don't try to print values that weren't intended to be printed, especially NULL GUID pointers.
// //
if (CallerId != NULL) { if (CallerId != NULL) {
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
" %g", " %g",
CallerId CallerId
); );
} }
if (Data != NULL) { if (Data != NULL) {
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
" %x", " %x",
Data Data
); );
} }
CharCount += AsciiSPrint ( CharCount += AsciiSPrint (
&Buffer[CharCount - 1], &Buffer[CharCount - 1],
(sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)), (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
"\n\r" "\n\r"
); );
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) { } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
sizeof (Buffer), sizeof (Buffer),
"PROGRESS CODE: V%x I%x\n\r", "PROGRESS CODE: V%x I%x\n\r",
Value, Value,
Instance Instance
); );
} else { } else {
CharCount = AsciiSPrint ( CharCount = AsciiSPrint (
Buffer, Buffer,
sizeof (Buffer), sizeof (Buffer),
"Undefined: C%x:V%x I%x\n\r", "Undefined: C%x:V%x I%x\n\r",
CodeType, CodeType,
Value, Value,
Instance Instance
); );
} }
// //
// Callout to standard output. // Callout to standard output.
// //
mUnix->Write ( mUnix->Write (
mStdOut, mStdOut,
Buffer, Buffer,
CharCount CharCount
); );
return EFI_SUCCESS; return EFI_SUCCESS;
} }

1
UnixPkg/Sec/SecMain.c
View File

@ -35,7 +35,6 @@ Abstract:
#include "SecMain.h" #include "SecMain.h"
#include <sys/mman.h> #include <sys/mman.h>
#include <Ppi/UnixPeiLoadFile.h> #include <Ppi/UnixPeiLoadFile.h>
#include <Framework/StatusCode.h>
#include <Ppi/TemporaryRamSupport.h> #include <Ppi/TemporaryRamSupport.h>
#include <dlfcn.h> #include <dlfcn.h>
// //

4
UnixPkg/Sec/SecMain.h
View File

@ -17,11 +17,9 @@ Abstract:
Include file for host API based SEC Include file for host API based SEC
--*/ --*/
#include "PiPei.h" #include <FrameworkPei.h>
#include "Uefi/UefiSpec.h"
#include <Protocol/UnixThunk.h> #include <Protocol/UnixThunk.h>
#include <Pi/PiFirmwareVolume.h>
#include <Ppi/StatusCode.h> #include <Ppi/StatusCode.h>
#include <Library/PeCoffLib.h> #include <Library/PeCoffLib.h>