From f25695723bfe21bf664589ae086a0c472d7fec80 Mon Sep 17 00:00:00 2001 From: AJFISH Date: Tue, 10 Jul 2007 17:16:14 +0000 Subject: Removed CommonHeader.h from NT32Pkg. Did not fix BDS as it will get re-written git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3181 6f19259b-4bc3-4df7-8a09-765794883524 --- Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h | 34 -------- Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf | 29 ------- Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c | 10 +-- Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c | 6 +- Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c | 5 +- Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c | 5 +- Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c | 6 +- Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c | 5 +- .../Library/EdkGenericBdsLib/EdkGenericBdsLib.inf | 45 +--------- .../EdkGenericBdsLib/EdkGenericBdsLibInternal.h | 96 ++++++++++++++++++++++ Nt32Pkg/Library/EdkGenericBdsLib/Performance.c | 7 +- Nt32Pkg/Library/EdkGenericBdsLib/Performance.h | 60 -------------- Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h | 32 -------- .../Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c | 8 +- .../Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf | 27 ------ .../Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h | 35 -------- .../Nt32PeiPeCoffGetEntryPointLib.inf | 36 -------- .../PeCoffGetEntryPoint.c | 10 ++- 18 files changed, 118 insertions(+), 338 deletions(-) delete mode 100644 Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h create mode 100644 Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h delete mode 100644 Nt32Pkg/Library/EdkGenericBdsLib/Performance.h delete mode 100644 Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h delete mode 100644 Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h (limited to 'Nt32Pkg/Library') diff --git a/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h b/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h deleted file mode 100644 index c6f575f..0000000 --- a/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h +++ /dev/null @@ -1,34 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - 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 __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -#include -// -// The protocols, PPI and GUID defintions for this module -// -// -// The Library classes this module consumes -// -#include -#include -#include - -#endif diff --git a/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf b/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf index dc22acc..1e48734 100644 --- a/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf +++ b/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf @@ -13,12 +13,6 @@ # # #**/ - -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = DxeWinNtLib @@ -39,36 +33,13 @@ # HOB Guid C Name: gEfiWinNtThunkProtocolGuid Hob Type: GUID_EXTENSION # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] WinNtLib.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec Nt32Pkg/Nt32Pkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] HobLib DebugLib diff --git a/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c b/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c index ef04eca..77efbb6 100644 --- a/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c +++ b/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c @@ -19,13 +19,13 @@ Abstract: --*/ +#include +#include +#include +#include +#include -// -// Include common header file for this module. -// -#include "CommonHeader.h" - EFI_WIN_NT_THUNK_PROTOCOL *gWinNt; EFI_STATUS diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c index de11d2e..78b2e99 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c +++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c @@ -19,12 +19,8 @@ Abstract: option. --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" -#include "Performance.h" +#include BOOLEAN mEnumBootDevice = FALSE; diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c index cb51488..6362c20 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c +++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c @@ -19,10 +19,7 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include VOID BdsLibConnectAll ( diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c index 7a88792..4dedf1d 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c +++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c @@ -19,10 +19,7 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include BOOLEAN IsNvNeed ( diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c index 819e926..13ec89f 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c +++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c @@ -19,10 +19,8 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include + #define MAX_STRING_LEN 200 static BOOLEAN mFeaturerSwitch = TRUE; diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c b/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c index d971705..70ad40e 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c +++ b/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c @@ -20,10 +20,7 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include EFI_GUID mEfiWinNtThunkProtocolGuid = EFI_WIN_NT_THUNK_PROTOCOL_GUID; EFI_GUID mEfiWinNtUgaGuid = EFI_WIN_NT_UGA_GUID; diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf index ba2e38b..ca25796 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf +++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf @@ -17,11 +17,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = EdkGenericBdsLib @@ -39,29 +34,14 @@ # VALID_ARCHITECTURES = IA32 # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] BdsMisc.c Performance.c - Performance.h DevicePath.c BdsConnect.c BdsConsole.c BdsBoot.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ + EdkGenericBdsLib.h [Packages] MdePkg/MdePkg.dec @@ -69,14 +49,6 @@ IntelFrameworkPkg/IntelFrameworkPkg.dec Nt32Pkg/Nt32Pkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] PeCoffLib PerformanceLib @@ -92,26 +64,11 @@ UefiLib BaseLib - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - [Guids] gEfiGlobalVariableGuid # ALWAYS_CONSUMED gEfiGenericPlatformVariableGuid # ALWAYS_CONSUMED gEfiShellFileGuid # ALWAYS_CONSUMED - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiSimpleFileSystemProtocolGuid # PROTOCOL SOMETIMES_CONSUMED gEfiLoadFileProtocolGuid # PROTOCOL SOMETIMES_CONSUMED diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h new file mode 100644 index 0000000..9d07a5c --- /dev/null +++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h @@ -0,0 +1,96 @@ +/**@file + Common header file shared by all source files. + + This file includes package header files, library classes and protocol, PPI & GUID definitions. + + 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 __EDK_GENERIC_BDS_LIB_INTERNAL_H_ +#define __EDK_GENERIC_BDS_LIB_INTERNAL_H_ + + +// +// The package level header files this module uses +// +#include +#include +// +// The protocols, PPI and GUID defintions for this module +// +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// +// The Library classes this module consumes +// +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PERF_TOKEN_LENGTH 28 +#define PERF_PEI_ENTRY_MAX_NUM 50 + +typedef struct { + CHAR8 Token[PERF_TOKEN_LENGTH]; + UINT32 Duration; +} PERF_DATA; + +typedef struct { + UINT64 BootToOs; + UINT64 S3Resume; + UINT32 S3EntryNum; + PERF_DATA S3Entry[PERF_PEI_ENTRY_MAX_NUM]; + UINT64 CpuFreq; + UINT64 BDSRaw; + UINT32 Count; + UINT32 Signiture; +} PERF_HEADER; + +VOID +WriteBootToOsPerformanceData ( + VOID + ); + +VOID +ClearDebugRegisters ( + VOID + ); + + +#endif diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c index e3013eb..7d581b4 100644 --- a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c +++ b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c @@ -21,12 +21,7 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - -#include "Performance.h" +#include STATIC diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h deleted file mode 100644 index cc05d28..0000000 --- a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h +++ /dev/null @@ -1,60 +0,0 @@ -/*++ - -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. - -Module Name: - - Performance.h - -Abstract: - - This file included the performance relete function header and - definition. - ---*/ - -#ifndef _PERF_H_ -#define _PERF_H_ - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - -#define PERF_TOKEN_LENGTH 28 -#define PERF_PEI_ENTRY_MAX_NUM 50 - -typedef struct { - CHAR8 Token[PERF_TOKEN_LENGTH]; - UINT32 Duration; -} PERF_DATA; - -typedef struct { - UINT64 BootToOs; - UINT64 S3Resume; - UINT32 S3EntryNum; - PERF_DATA S3Entry[PERF_PEI_ENTRY_MAX_NUM]; - UINT64 CpuFreq; - UINT64 BDSRaw; - UINT32 Count; - UINT32 Signiture; -} PERF_HEADER; - -VOID -WriteBootToOsPerformanceData ( - VOID - ); - -VOID -ClearDebugRegisters ( - VOID - ); - -#endif diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h deleted file mode 100644 index 9804608..0000000 --- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h +++ /dev/null @@ -1,32 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - 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 __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -// -// The Library classes this module consumes -// -#include - -#endif diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c index 6d273f4..8eaa2ab 100644 --- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c +++ b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c @@ -20,13 +20,11 @@ Abstract: --*/ +#include +#include +#include -// -// Include common header file for this module. -// -#include "CommonHeader.h" - EFI_PEI_PE_COFF_LOADER_PROTOCOL *mPeiEfiPeiPeCoffLoader; EFI_STATUS diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf index a24b544..e4d384a 100644 --- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf +++ b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Nt32PeCoffLoaderLib @@ -37,35 +32,13 @@ # VALID_ARCHITECTURES = IA32 # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] Nt32PeCoffLoader.c - CommonHeader.h - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - -################################################################################ -# -# PPI C Name Section - list of PPI and PPI Notify C Names that this module -# uses or produces. -# -################################################################################ - [Ppis] gEfiPeiPeCoffLoaderGuid # PPI ALWAYS_CONSUMED diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h deleted file mode 100644 index 16f6375..0000000 --- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h +++ /dev/null @@ -1,35 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - 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 __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -#include -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -// -// The Library classes this module consumes -// -#include -#include - -#endif diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf index d7fd32c..705aa2f 100644 --- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf +++ b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = EdkNt32PeiPeCoffGetEntryPointLib @@ -36,47 +31,16 @@ # VALID_ARCHITECTURES = IA32 # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] PeCoffGetEntryPoint.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec Nt32Pkg/Nt32Pkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] PeiServicesLib - -################################################################################ -# -# PPI C Name Section - list of PPI and PPI Notify C Names that this module -# uses or produces. -# -################################################################################ - [Ppis] gNtPeiLoadFilePpiGuid # PPI ALWAYS_CONSUMED diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c index fd8f739..4f3c505 100644 --- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c +++ b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c @@ -21,11 +21,13 @@ Revision History --*/ +#include +#include +#include +#include +#include +#include -// -// Include common header file for this module. -// -#include "CommonHeader.h" RETURN_STATUS EFIAPI -- cgit v1.1