From 694b922c0b238c7e358bd48ddbd835fd48a29f33 Mon Sep 17 00:00:00 2001 From: bxing Date: Wed, 4 Jul 2007 12:13:24 +0000 Subject: [PATCH] Corrected uses of IntelFrameworkPkg header files. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3051 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Bus/Pci/IdeBus/Dxe/idebus.h | 15 +++++------ .../Bus/Pci/PciBus/Dxe/pcibus.h | 5 ++-- .../DataHub/DataHubStdErr/Dxe/DataHubStdErr.c | 4 +-- .../Framework/{FrameworkDxeCis.h => DxeCis.h} | 2 +- ...mwareFileSystem.h => FirmwareFileSystem.h} | 0 ...eVolumeHeader.h => FirmwareVolumeHeader.h} | 16 +++++++----- ...geFormat.h => FirmwareVolumeImageFormat.h} | 0 .../Framework/{FrameworkHob.h => Hob.h} | 0 .../{FrameworkLegacy16.h => Legacy16.h} | 0 .../Framework/{FrameworkSmmCis.h => SmmCis.h} | 2 +- .../{FrameworkStatusCode.h => StatusCode.h} | 0 ...odeDataTypeId.h => StatusCodeDataTypeId.h} | 2 +- IntelFrameworkPkg/Include/FrameworkDxe.h | 4 +-- IntelFrameworkPkg/Include/FrameworkPei.h | 16 ++++++------ IntelFrameworkPkg/Include/FrameworkSmm.h | 3 ++- .../Include/Ppi/BootScriptExecuter.h | 6 +++-- IntelFrameworkPkg/Include/Ppi/FindFv.h | 26 ++++++++++--------- Nt32Pkg/CpuRuntimeDxe/CommonHeader.h | 4 +-- 18 files changed, 55 insertions(+), 50 deletions(-) rename IntelFrameworkPkg/Include/Framework/{FrameworkDxeCis.h => DxeCis.h} (95%) rename IntelFrameworkPkg/Include/Framework/{FrameworkFirmwareFileSystem.h => FirmwareFileSystem.h} (100%) rename IntelFrameworkPkg/Include/Framework/{FrameworkFirmwareVolumeHeader.h => FirmwareVolumeHeader.h} (87%) rename IntelFrameworkPkg/Include/Framework/{FrameworkFirmwareVolumeImageFormat.h => FirmwareVolumeImageFormat.h} (100%) rename IntelFrameworkPkg/Include/Framework/{FrameworkHob.h => Hob.h} (100%) rename IntelFrameworkPkg/Include/Framework/{FrameworkLegacy16.h => Legacy16.h} (100%) rename IntelFrameworkPkg/Include/Framework/{FrameworkSmmCis.h => SmmCis.h} (96%) rename IntelFrameworkPkg/Include/Framework/{FrameworkStatusCode.h => StatusCode.h} (100%) rename IntelFrameworkPkg/Include/Framework/{FrameworkStatusCodeDataTypeId.h => StatusCodeDataTypeId.h} (96%) diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h index a0c90fd3a7..c9f11ef44c 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.h @@ -2,13 +2,13 @@ Header file for IDE Bus Driver. 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 + 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. + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ @@ -19,8 +19,7 @@ // // The package level header files this module uses // -#include -#include +#include // // The protocols, PPI and GUID defintions for this module // diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h index f295e1946e..b2149a22ff 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h @@ -27,9 +27,8 @@ Revision History // // The package level header files this module uses // -#include -#include -#include +#include + // // The protocols, PPI and GUID defintions for this module // diff --git a/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c index 50e40c0bae..5a762e09e9 100644 --- a/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c +++ b/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c @@ -23,8 +23,8 @@ Abstract: // // The package level header files this module uses // -#include -#include +#include + // // The protocols, PPI and GUID defintions for this module // diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkDxeCis.h b/IntelFrameworkPkg/Include/Framework/DxeCis.h similarity index 95% rename from IntelFrameworkPkg/Include/Framework/FrameworkDxeCis.h rename to IntelFrameworkPkg/Include/Framework/DxeCis.h index 0b7ffdf0a8..f7a6c18c86 100644 --- a/IntelFrameworkPkg/Include/Framework/FrameworkDxeCis.h +++ b/IntelFrameworkPkg/Include/Framework/DxeCis.h @@ -22,7 +22,7 @@ #define _FRAMEWORK_DXE_CIS_H_ #include -#include +#include #include // diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkFirmwareFileSystem.h b/IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h similarity index 100% rename from IntelFrameworkPkg/Include/Framework/FrameworkFirmwareFileSystem.h rename to IntelFrameworkPkg/Include/Framework/FirmwareFileSystem.h diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkFirmwareVolumeHeader.h b/IntelFrameworkPkg/Include/Framework/FirmwareVolumeHeader.h similarity index 87% rename from IntelFrameworkPkg/Include/Framework/FrameworkFirmwareVolumeHeader.h rename to IntelFrameworkPkg/Include/Framework/FirmwareVolumeHeader.h index 1f584fe0e2..aac032d486 100644 --- a/IntelFrameworkPkg/Include/Framework/FrameworkFirmwareVolumeHeader.h +++ b/IntelFrameworkPkg/Include/Framework/FirmwareVolumeHeader.h @@ -3,14 +3,14 @@ all firmware volumes that are either memory mapped, or have an associated FirmwareVolumeBlock protocol. - Copyright (c) 2006, 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 + Copyright (c) 2006, 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. + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: FirmwareVolumeHeader.h @@ -22,6 +22,8 @@ #ifndef __EFI_FIRMWARE_VOLUME_HEADER_H__ #define __EFI_FIRMWARE_VOLUME_HEADER_H__ +#include + // // Firmware Volume Block Attributes definition // diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkFirmwareVolumeImageFormat.h b/IntelFrameworkPkg/Include/Framework/FirmwareVolumeImageFormat.h similarity index 100% rename from IntelFrameworkPkg/Include/Framework/FrameworkFirmwareVolumeImageFormat.h rename to IntelFrameworkPkg/Include/Framework/FirmwareVolumeImageFormat.h diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkHob.h b/IntelFrameworkPkg/Include/Framework/Hob.h similarity index 100% rename from IntelFrameworkPkg/Include/Framework/FrameworkHob.h rename to IntelFrameworkPkg/Include/Framework/Hob.h diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkLegacy16.h b/IntelFrameworkPkg/Include/Framework/Legacy16.h similarity index 100% rename from IntelFrameworkPkg/Include/Framework/FrameworkLegacy16.h rename to IntelFrameworkPkg/Include/Framework/Legacy16.h diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkSmmCis.h b/IntelFrameworkPkg/Include/Framework/SmmCis.h similarity index 96% rename from IntelFrameworkPkg/Include/Framework/FrameworkSmmCis.h rename to IntelFrameworkPkg/Include/Framework/SmmCis.h index 6fe8e662d9..e8276d3d74 100644 --- a/IntelFrameworkPkg/Include/Framework/FrameworkSmmCis.h +++ b/IntelFrameworkPkg/Include/Framework/SmmCis.h @@ -20,7 +20,7 @@ #ifndef _FRAMEWORK_SMM_CIS_H_ #define _FRAMEWORK_SMM_CIS_H_ -#include +#include #define EFI_SMM_CPU_IO_GUID \ { \ diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkStatusCode.h b/IntelFrameworkPkg/Include/Framework/StatusCode.h similarity index 100% rename from IntelFrameworkPkg/Include/Framework/FrameworkStatusCode.h rename to IntelFrameworkPkg/Include/Framework/StatusCode.h diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkStatusCodeDataTypeId.h b/IntelFrameworkPkg/Include/Framework/StatusCodeDataTypeId.h similarity index 96% rename from IntelFrameworkPkg/Include/Framework/FrameworkStatusCodeDataTypeId.h rename to IntelFrameworkPkg/Include/Framework/StatusCodeDataTypeId.h index 92c222a9de..269a3dcc92 100644 --- a/IntelFrameworkPkg/Include/Framework/FrameworkStatusCodeDataTypeId.h +++ b/IntelFrameworkPkg/Include/Framework/StatusCodeDataTypeId.h @@ -21,7 +21,7 @@ #ifndef __FRAMEWORK_STATUS_CODE_DATA_TYPE_ID_H__ #define __FRAMEWORK_STATUS_CODE_DATA_TYPE_ID_H__ -#include +#include #include /// diff --git a/IntelFrameworkPkg/Include/FrameworkDxe.h b/IntelFrameworkPkg/Include/FrameworkDxe.h index 1d1c0ef140..07eece9670 100644 --- a/IntelFrameworkPkg/Include/FrameworkDxe.h +++ b/IntelFrameworkPkg/Include/FrameworkDxe.h @@ -21,7 +21,7 @@ #define _FRAMEWORK_DXE_H_ #include -#include -#include + +#include #endif diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h index fa9cada07c..6719db37be 100644 --- a/IntelFrameworkPkg/Include/FrameworkPei.h +++ b/IntelFrameworkPkg/Include/FrameworkPei.h @@ -22,13 +22,13 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/IntelFrameworkPkg/Include/FrameworkSmm.h b/IntelFrameworkPkg/Include/FrameworkSmm.h index 0226b9a15b..ed69b2e853 100644 --- a/IntelFrameworkPkg/Include/FrameworkSmm.h +++ b/IntelFrameworkPkg/Include/FrameworkSmm.h @@ -21,6 +21,7 @@ #define _FRAMEWORK_SMM_H_ #include -#include + +#include #endif diff --git a/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h b/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h index a622381274..88a9ec57a2 100644 --- a/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h +++ b/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h @@ -18,8 +18,10 @@ **/ -#ifndef _PEI_BOOT_SCRIPT_EXECUTER_PPI_H -#define _PEI_BOOT_SCRIPT_EXECUTER_PPI_H +#ifndef _PEI_BOOT_SCRIPT_EXECUTER_PPI_H_ +#define _PEI_BOOT_SCRIPT_EXECUTER_PPI_H_ + +#include #define EFI_ACPI_S3_RESUME_SCRIPT_TABLE 0x00 diff --git a/IntelFrameworkPkg/Include/Ppi/FindFv.h b/IntelFrameworkPkg/Include/Ppi/FindFv.h index 9a3e173742..218ec94aee 100644 --- a/IntelFrameworkPkg/Include/Ppi/FindFv.h +++ b/IntelFrameworkPkg/Include/Ppi/FindFv.h @@ -1,14 +1,14 @@ /** @file This file declares FindFv PPI used to locate FVs that contain PEIMs in PEI - Copyright (c) 2006, 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 + 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. + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: FindFv.h @@ -18,8 +18,10 @@ **/ -#ifndef __FIND_FV_H__ -#define __FIND_FV_H__ +#ifndef _FIND_FV_H_ +#define _FIND_FV_H_ + +#include #define EFI_PEI_FIND_FV_PPI_GUID \ { \ @@ -29,8 +31,8 @@ typedef struct _EFI_PEI_FIND_FV_PPI EFI_PEI_FIND_FV_PPI; /** - This interface returns the base address of the firmware volume whose index - was passed in FvNumber.Once this function reports a firmware volume + This interface returns the base address of the firmware volume whose index + was passed in FvNumber.Once this function reports a firmware volume index/base address pair, that index/address pairing must continue throughout PEI. @param PeiServices Pointer to the PEI Services Table. @@ -55,7 +57,7 @@ EFI_STATUS /** @par Ppi Description: Hardware mechanisms for locating FVs in a platform vary widely. - EFI_PEI_FIND_FV_PPI serves to abstract this variation so that the + EFI_PEI_FIND_FV_PPI serves to abstract this variation so that the PEI Foundation can remain standard across a wide variety of platforms. @param FindFv diff --git a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h index 3d47474599..8202791781 100644 --- a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h +++ b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h @@ -19,15 +19,15 @@ // // The package level header files this module uses // -#include +#include #include + // // The protocols, PPI and GUID defintions for this module // #include #include #include -#include #include #include #include -- 2.39.2