diff options
author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-06-28 03:22:01 +0000 |
---|---|---|
committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-06-28 03:22:01 +0000 |
commit | 53f93f7ec59b51d896a2573e74edad19cad115fb (patch) | |
tree | 163f85bdfbc0d83f82149e9ba79771c09077f689 /IntelFrameworkPkg/Library | |
parent | 076606899f5db5b556f0153b990eebb0990f95d4 (diff) | |
download | edk2-53f93f7ec59b51d896a2573e74edad19cad115fb.tar.gz edk2-53f93f7ec59b51d896a2573e74edad19cad115fb.tar.bz2 edk2-53f93f7ec59b51d896a2573e74edad19cad115fb.zip |
1. fixed one bug in Common/FrameworkFirmwareFileSystem.h
2. add IntelFrameworkPkg.dsc
3. add Guid/StatusCodeDataTypeId.h and update IntelFrameworkPkg.dec and IntelFrameworkPkg.nspd
4. Port DxeIoLibCpuIo.inf, DxeReportStatusCodeLib.inf and DxeSmmDriverEntryPoint.inf
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2827 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFrameworkPkg/Library')
8 files changed, 68 insertions, 19 deletions
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h index ef3dc1041c..e0e54243b4 100644 --- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h +++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeCpuIoLibInternal.h @@ -17,14 +17,25 @@ #ifndef _DXE_CPUIO_LIB_INTERNAL_H_
#define _DXE_CPUIO_LIB_INTERNAL_H_
+//
+// The package level header files this module uses
+//
#include <FrameworkDxe.h>
+
+//
+// The protocols, PPI and GUID defintions for this module
+//
+#include <Protocol/CpuIo.h>
+#include <Protocol/PciRootBridgeIo.h>
+
+//
+// The Library classes this module consumes
+//
#include <Library/IoLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/DebugLib.h>
#include <Library/BaseLib.h>
-#include <Protocol/PciRootBridgeIo.h>
-#include <Protocol/CpuIo.h>
/**
Reads registers in the EFI CPU I/O space.
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c index 719fe13017..b47b889bd0 100644 --- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c +++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoHighLevel.c @@ -23,6 +23,11 @@ **/
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
#include "DxeCpuIoLibInternal.h"
/**
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c index 096f899be6..e124e39b6c 100644 --- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c +++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c @@ -14,6 +14,11 @@ **/
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
#include "DxeCpuIoLibInternal.h"
//
@@ -146,7 +151,7 @@ MmioReadWorker ( UINT64 Data;
if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo.Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);
+ Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);
} else {
Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);
}
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c index d3f745c6a1..42d513d324 100644 --- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c +++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c @@ -12,6 +12,11 @@ **/
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
#include "DxeCpuIoLibInternal.h"
/**
diff --git a/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c index 270966a884..e2f9d5fa47 100644 --- a/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c +++ b/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c @@ -12,16 +12,26 @@ **/
-#include <Common/FrameworkDxeCis.h>
+//
+// The package level header files this module uses
+//
+#include <FrameworkDxe.h>
+//
+// The protocols, PPI and GUID defintions for this module
+//
+#include <Guid/StatusCodeDataTypeId.h>
+#include <Protocol/StatusCode.h>
+//
+// The Library classes this module consumes
+//
+#include <Library/ReportStatusCodeLib.h>
#include <Library/DebugLib.h>
#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/PcdLib.h>
-#include <Library/ReportStatusCodeLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Protocol/StatusCode.h>
/**
Internal worker function that reports a status code through the Status Code Protocol
diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c index cf50f2395b..6cba691c46 100644 --- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c +++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c @@ -12,6 +12,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
+//
+// Include common header file for this module.
+//
+#include "CommonHeader.h"
+
#include <FrameworkDxe.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/DebugLib.h>
diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c index 3b0876cc3b..4315f38a32 100644 --- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c @@ -2,27 +2,36 @@ HII Library implementation that uses DXE protocols and services.
Copyright (c) 2006, Intel Corporation<BR>
- 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.
Module Name: HiiLib.c
**/
//
-// Include common header file for this module.
+// The package level header files this module uses
//
-#include "CommonHeader.h"
+#include <PiDxe.h>
+//
+// The protocols, PPI and GUID defintions for this module
+//
+//
+// The Library classes this module consumes
+//
+#include <Library/FrameworkHiiLib.h>
+#include <Library/DebugLib.h>
+#include <Library/MemoryAllocationLib.h>
/**
This function allocates pool for an EFI_HII_PACKAGES structure
with enough space for the variable argument list of package pointers.
- The allocated structure is initialized using NumberOfPackages, Guid,
+ The allocated structure is initialized using NumberOfPackages, Guid,
and the variable length argument list of package pointers.
@param NumberOfPackages The number of HII packages to prepare.
diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf index b16a40c50f..2689226504 100644 --- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf +++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf @@ -25,7 +25,7 @@ FILE_GUID = 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
- LIBRARY_CLASS = HiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER
+ LIBRARY_CLASS = HiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
@@ -44,7 +44,6 @@ [Sources.common]
HiiLib.c
- CommonHeader.h
################################################################################
@@ -56,7 +55,7 @@ [Includes]
$(WORKSPACE)/MdePkg/Include/Library
-
+
################################################################################
#
# Package Dependency Section - list of Package files that are required for
|