diff options
author | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-07-04 12:13:24 +0000 |
---|---|---|
committer | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-07-04 12:13:24 +0000 |
commit | d3bfcd5a7ffb71688d390fb4c621695b6b8daf5a (patch) | |
tree | 8bec427ccddb6af435184ed44410addd0900699f | |
parent | 137f101f9437d39770f822ca79a656675800aec6 (diff) | |
download | edk2-d3bfcd5a7ffb71688d390fb4c621695b6b8daf5a.zip edk2-d3bfcd5a7ffb71688d390fb4c621695b6b8daf5a.tar.gz edk2-d3bfcd5a7ffb71688d390fb4c621695b6b8daf5a.tar.bz2 |
Corrected uses of IntelFrameworkPkg header files.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/IntelFrameworkPkg@3051 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r-- | Include/Framework/DxeCis.h (renamed from Include/Framework/FrameworkDxeCis.h) | 2 | ||||
-rw-r--r-- | Include/Framework/FirmwareFileSystem.h (renamed from Include/Framework/FrameworkFirmwareFileSystem.h) | 0 | ||||
-rw-r--r-- | Include/Framework/FirmwareVolumeHeader.h (renamed from Include/Framework/FrameworkFirmwareVolumeHeader.h) | 16 | ||||
-rw-r--r-- | Include/Framework/FirmwareVolumeImageFormat.h (renamed from Include/Framework/FrameworkFirmwareVolumeImageFormat.h) | 0 | ||||
-rw-r--r-- | Include/Framework/Hob.h (renamed from Include/Framework/FrameworkHob.h) | 0 | ||||
-rw-r--r-- | Include/Framework/Legacy16.h (renamed from Include/Framework/FrameworkLegacy16.h) | 0 | ||||
-rw-r--r-- | Include/Framework/SmmCis.h (renamed from Include/Framework/FrameworkSmmCis.h) | 2 | ||||
-rw-r--r-- | Include/Framework/StatusCode.h (renamed from Include/Framework/FrameworkStatusCode.h) | 0 | ||||
-rw-r--r-- | Include/Framework/StatusCodeDataTypeId.h (renamed from Include/Framework/FrameworkStatusCodeDataTypeId.h) | 2 | ||||
-rw-r--r-- | Include/FrameworkDxe.h | 4 | ||||
-rw-r--r-- | Include/FrameworkPei.h | 16 | ||||
-rw-r--r-- | Include/FrameworkSmm.h | 3 | ||||
-rw-r--r-- | Include/Ppi/BootScriptExecuter.h | 6 | ||||
-rw-r--r-- | Include/Ppi/FindFv.h | 26 |
14 files changed, 42 insertions, 35 deletions
diff --git a/Include/Framework/FrameworkDxeCis.h b/Include/Framework/DxeCis.h index 0b7ffdf..f7a6c18c 100644 --- a/Include/Framework/FrameworkDxeCis.h +++ b/Include/Framework/DxeCis.h @@ -22,7 +22,7 @@ #define _FRAMEWORK_DXE_CIS_H_
#include <PiDxe.h>
-#include <Common/FrameworkStatusCode.h>
+#include <Framework/StatusCode.h>
#include <Protocol/StatusCode.h>
//
diff --git a/Include/Framework/FrameworkFirmwareFileSystem.h b/Include/Framework/FirmwareFileSystem.h index c0acbc9..c0acbc9 100644 --- a/Include/Framework/FrameworkFirmwareFileSystem.h +++ b/Include/Framework/FirmwareFileSystem.h diff --git a/Include/Framework/FrameworkFirmwareVolumeHeader.h b/Include/Framework/FirmwareVolumeHeader.h index 1f584fe..aac032d 100644 --- a/Include/Framework/FrameworkFirmwareVolumeHeader.h +++ b/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 <FrameworkPei.h>
+
//
// Firmware Volume Block Attributes definition
//
diff --git a/Include/Framework/FrameworkFirmwareVolumeImageFormat.h b/Include/Framework/FirmwareVolumeImageFormat.h index 9b4e3b6..9b4e3b6 100644 --- a/Include/Framework/FrameworkFirmwareVolumeImageFormat.h +++ b/Include/Framework/FirmwareVolumeImageFormat.h diff --git a/Include/Framework/FrameworkHob.h b/Include/Framework/Hob.h index cdc419d..cdc419d 100644 --- a/Include/Framework/FrameworkHob.h +++ b/Include/Framework/Hob.h diff --git a/Include/Framework/FrameworkLegacy16.h b/Include/Framework/Legacy16.h index 7f80c8a..7f80c8a 100644 --- a/Include/Framework/FrameworkLegacy16.h +++ b/Include/Framework/Legacy16.h diff --git a/Include/Framework/FrameworkSmmCis.h b/Include/Framework/SmmCis.h index 6fe8e66..e8276d3 100644 --- a/Include/Framework/FrameworkSmmCis.h +++ b/Include/Framework/SmmCis.h @@ -20,7 +20,7 @@ #ifndef _FRAMEWORK_SMM_CIS_H_
#define _FRAMEWORK_SMM_CIS_H_
-#include <Common/FrameworkDxeCis.h>
+#include <Framework/DxeCis.h>
#define EFI_SMM_CPU_IO_GUID \
{ \
diff --git a/Include/Framework/FrameworkStatusCode.h b/Include/Framework/StatusCode.h index 6e997b6..6e997b6 100644 --- a/Include/Framework/FrameworkStatusCode.h +++ b/Include/Framework/StatusCode.h diff --git a/Include/Framework/FrameworkStatusCodeDataTypeId.h b/Include/Framework/StatusCodeDataTypeId.h index 92c222a..269a3dc 100644 --- a/Include/Framework/FrameworkStatusCodeDataTypeId.h +++ b/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 <Common/DataHubRecords.h>
+#include <Framework/DataHubRecords.h>
#include <Protocol/DebugSupport.h>
///
diff --git a/Include/FrameworkDxe.h b/Include/FrameworkDxe.h index 1d1c0ef..07eece9 100644 --- a/Include/FrameworkDxe.h +++ b/Include/FrameworkDxe.h @@ -21,7 +21,7 @@ #define _FRAMEWORK_DXE_H_
#include <FrameworkPei.h>
-#include <PiDxe.h>
-#include <Common/FrameworkDxeCis.h>
+
+#include <Framework/DxeCis.h>
#endif
diff --git a/Include/FrameworkPei.h b/Include/FrameworkPei.h index fa9cada..6719db3 100644 --- a/Include/FrameworkPei.h +++ b/Include/FrameworkPei.h @@ -22,13 +22,13 @@ #include <PiPei.h>
-#include <Common/FrameworkFirmwareFileSystem.h>
-#include <Common/FrameworkFirmwareVolumeImageFormat.h>
-#include <Common/FrameworkFirmwareVolumeHeader.h>
-#include <Common/FrameworkHob.h>
-#include <Common/FrameworkLegacy16.h>
-#include <Common/DataHubRecords.h>
-#include <Common/FrameworkStatusCode.h>
-#include <Common/FrameworkStatusCodeDataTypeId.h>
+#include <Framework/FirmwareFileSystem.h>
+#include <Framework/FirmwareVolumeImageFormat.h>
+#include <Framework/FirmwareVolumeHeader.h>
+#include <Framework/Hob.h>
+#include <Framework/Legacy16.h>
+#include <Framework/DataHubRecords.h>
+#include <Framework/StatusCode.h>
+#include <Framework/StatusCodeDataTypeId.h>
#endif
diff --git a/Include/FrameworkSmm.h b/Include/FrameworkSmm.h index 0226b9a..ed69b2e 100644 --- a/Include/FrameworkSmm.h +++ b/Include/FrameworkSmm.h @@ -21,6 +21,7 @@ #define _FRAMEWORK_SMM_H_
#include <FrameworkDxe.h>
-#include <Common/FrameworkSmmCis.h>
+
+#include <Framework/SmmCis.h>
#endif
diff --git a/Include/Ppi/BootScriptExecuter.h b/Include/Ppi/BootScriptExecuter.h index a622381..88a9ec5 100644 --- a/Include/Ppi/BootScriptExecuter.h +++ b/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 <FrameworkPei.h>
#define EFI_ACPI_S3_RESUME_SCRIPT_TABLE 0x00
diff --git a/Include/Ppi/FindFv.h b/Include/Ppi/FindFv.h index 9a3e173..218ec94 100644 --- a/Include/Ppi/FindFv.h +++ b/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 <FrameworkPei.h>
#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
|