From f25695723bfe21bf664589ae086a0c472d7fec80 Mon Sep 17 00:00:00 2001 From: AJFISH Date: Tue, 10 Jul 2007 17:16:14 +0000 Subject: [PATCH] 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/CpuRuntimeDxe/CommonHeader.h | 44 --------- Nt32Pkg/CpuRuntimeDxe/Cpu.c | 4 - Nt32Pkg/CpuRuntimeDxe/Cpu.inf | 50 ---------- Nt32Pkg/CpuRuntimeDxe/CpuDriver.h | 17 +++- Nt32Pkg/CpuRuntimeDxe/CpuIo.c | 5 - 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 +- .../EdkGenericBdsLib/EdkGenericBdsLib.inf | 45 +-------- .../EdkGenericBdsLibInternal.h | 96 +++++++++++++++++++ .../Library/EdkGenericBdsLib/Performance.c | 7 +- .../Library/EdkGenericBdsLib/Performance.h | 60 ------------ .../Nt32PeCoffLoaderLib/CommonHeader.h | 32 ------- .../Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c | 8 +- .../Nt32PeCoffLoaderLib.inf | 27 ------ .../CommonHeader.h | 35 ------- .../Nt32PeiPeCoffGetEntryPointLib.inf | 36 ------- .../PeCoffGetEntryPoint.c | 10 +- Nt32Pkg/MetronomeDxe/CommonHeader.h | 37 ------- Nt32Pkg/MetronomeDxe/Metronome.c | 5 - Nt32Pkg/MetronomeDxe/Metronome.h | 13 ++- Nt32Pkg/MetronomeDxe/Metronome.inf | 39 +------- .../MiscSubClassPlatformDxe/CommonHeader.h | 43 --------- .../MiscBaseBoardManufacturerData.c | 5 - .../MiscBiosVendorData.c | 5 - .../MiscBootInformationData.c | 5 - .../MiscChassisManufacturerData.c | 5 - .../MiscSubClassPlatformDxe/MiscDevicePath.h | 5 - .../MiscNumberOfInstallableLanguagesData.c | 5 - .../MiscOemStringData.c | 5 - .../MiscPortInternalConnectorDesignatorData.c | 5 - ...cPortInternalConnectorDesignatorFunction.c | 5 - .../MiscResetCapabilitiesData.c | 5 - .../MiscSubclassDriver.h | 20 ++-- .../MiscSubclassDriverDataTable.c | 5 - .../MiscSubclassDriverEntryPoint.c | 5 - .../MiscSystemLanguageStringData.c | 5 - .../MiscSystemManufacturerData.c | 5 - .../MiscSystemManufacturerFunction.c | 5 - .../MiscSystemOptionStringData.c | 5 - .../MiscSystemSlotDesignationData.c | 5 - .../RealTimeClockRuntimeDxe/CommonHeader.h | 36 ------- .../RealTimeClockRuntimeDxe/RealTimeClock.c | 12 ++- .../RealTimeClockRuntimeDxe/RealTimeClock.inf | 40 +------- Nt32Pkg/ResetRuntimeDxe/CommonHeader.h | 36 ------- Nt32Pkg/ResetRuntimeDxe/Reset.inf | 37 ------- Nt32Pkg/ResetRuntimeDxe/reset.c | 12 ++- Nt32Pkg/TimerDxe/CommonHeader.h | 37 ------- Nt32Pkg/TimerDxe/Timer.c | 5 - Nt32Pkg/TimerDxe/Timer.h | 13 ++- Nt32Pkg/TimerDxe/Timer.inf | 47 +-------- 56 files changed, 181 insertions(+), 912 deletions(-) delete mode 100644 Nt32Pkg/CpuRuntimeDxe/CommonHeader.h 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 delete mode 100644 Nt32Pkg/MetronomeDxe/CommonHeader.h delete mode 100644 Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h delete mode 100644 Nt32Pkg/RealTimeClockRuntimeDxe/CommonHeader.h delete mode 100644 Nt32Pkg/ResetRuntimeDxe/CommonHeader.h delete mode 100644 Nt32Pkg/TimerDxe/CommonHeader.h diff --git a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h deleted file mode 100644 index 8202791781..0000000000 --- a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h +++ /dev/null @@ -1,44 +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 -// -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include - -#endif diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c index 499ec2da8c..a3317526aa 100644 --- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c +++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c @@ -22,10 +22,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" #include "CpuDriver.h" diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.inf b/Nt32Pkg/CpuRuntimeDxe/Cpu.inf index e659b7b1ad..bb3c8537b9 100644 --- a/Nt32Pkg/CpuRuntimeDxe/Cpu.inf +++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Cpu @@ -36,40 +31,17 @@ # VALID_ARCHITECTURES = IA32 # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] Cpu.dxs CpuIo.c Cpu.c CpuDriver.h Strings.uni - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] UefiBootServicesTableLib MemoryAllocationLib @@ -78,27 +50,12 @@ HiiLibFramework DebugLib - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - [Guids] gEfiWinNtCPUSpeedGuid # SOMETIMES_CONSUMED gEfiWinNtCPUModelGuid # SOMETIMES_CONSUMED gEfiProcessorSubClassGuid # SOMETIMES_CONSUMED gEfiProcessorProducerGuid # SOMETIMES_CONSUMED - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiWinNtIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED gEfiDataHubProtocolGuid # PROTOCOL SOMETIMES_CONSUMED @@ -107,12 +64,5 @@ gEfiCpuIoProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiCpuArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED -################################################################################ -# -# Dependency Expression Section - list of Dependency expressions that are required for -# this module. -# -################################################################################ - [Depex] gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h index 781d8c65df..15316fb689 100644 --- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h +++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h @@ -23,11 +23,20 @@ Abstract: #define _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -// -// Include common header file for this module. -// -#include "CommonHeader.h" extern UINT8 CpuStrings[]; diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c index a3b7c59e91..4aaa431d54 100644 --- a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c +++ b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c @@ -23,11 +23,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include #define IA32_MAX_IO_ADDRESS 0xFFFF diff --git a/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h b/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h deleted file mode 100644 index c6f575f742..0000000000 --- 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 dc22accf00..1e487349b9 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 ef04eca44b..77efbb6a87 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 de11d2eacf..78b2e99661 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 cb51488795..6362c20b70 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 7a88792d72..4dedf1d7ff 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 819e926290..13ec89f501 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 d971705ae6..70ad40e8c9 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 ba2e38b9c3..ca25796624 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 0000000000..9d07a5c88b --- /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 e3013ebbb1..7d581b45f0 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 cc05d28ae6..0000000000 --- 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 98046089bf..0000000000 --- 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 6d273f47e6..8eaa2aba43 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 a24b544d23..e4d384ae82 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 16f63752f2..0000000000 --- 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 d7fd32c352..705aa2fa86 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 fd8f739a85..4f3c505cdd 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 diff --git a/Nt32Pkg/MetronomeDxe/CommonHeader.h b/Nt32Pkg/MetronomeDxe/CommonHeader.h deleted file mode 100644 index 7eb12c16a7..0000000000 --- a/Nt32Pkg/MetronomeDxe/CommonHeader.h +++ /dev/null @@ -1,37 +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 -// -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include - -#endif diff --git a/Nt32Pkg/MetronomeDxe/Metronome.c b/Nt32Pkg/MetronomeDxe/Metronome.c index b02741b45c..394ca6e717 100644 --- a/Nt32Pkg/MetronomeDxe/Metronome.c +++ b/Nt32Pkg/MetronomeDxe/Metronome.c @@ -19,11 +19,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Metronome.h" // diff --git a/Nt32Pkg/MetronomeDxe/Metronome.h b/Nt32Pkg/MetronomeDxe/Metronome.h index b2b40eeadc..cf2b52bc48 100644 --- a/Nt32Pkg/MetronomeDxe/Metronome.h +++ b/Nt32Pkg/MetronomeDxe/Metronome.h @@ -22,13 +22,16 @@ Abstract: #ifndef _NT_THUNK_METRONOME_H_ #define _NT_THUNK_METRONOME_H_ +#include +#include +#include +#include +#include +#include +#include +#include -// -// Include common header file for this module. -// -#include "CommonHeader.h" - // // Period of on tick in 100 nanosecond units // diff --git a/Nt32Pkg/MetronomeDxe/Metronome.inf b/Nt32Pkg/MetronomeDxe/Metronome.inf index 15aec0ea1b..87ca79706c 100644 --- a/Nt32Pkg/MetronomeDxe/Metronome.inf +++ b/Nt32Pkg/MetronomeDxe/Metronome.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Metronome @@ -36,36 +31,13 @@ # VALID_ARCHITECTURES = IA32 # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] Metronome.h Metronome.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] UefiBootServicesTableLib WinNtLib @@ -73,16 +45,9 @@ DebugLib BaseLib - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiMetronomeArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED [depex] - TRUE \ No newline at end of file + TRUE + \ No newline at end of file diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h b/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h deleted file mode 100644 index 93d7ac19c3..0000000000 --- a/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h +++ /dev/null @@ -1,43 +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 -// -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c index b7594f703a..9536c88aa4 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c index f2363f3c66..3187aba2a0 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c index 8741468698..1bf280b141 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c index 3e7d340780..5c657eef15 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h index 3880aa49fb..dd78a7af12 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h @@ -24,11 +24,6 @@ Abstract: #define _MISC_DEVICE_PATH_H -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #pragma pack(1) // // USB diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c index b3d2c2eceb..008425987b 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c index 7d89033281..fdfbd1f2e1 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c index e961df7aea..d886a9d8c4 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c index d493ef0bc7..35351aa2df 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c index 65bd0b5049..6e0c1bb5ad 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h index 801b2c3bf1..1374d7b135 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h @@ -22,15 +22,23 @@ Abstract: #ifndef _MISC_SUBCLASS_DRIVER_H #define _MISC_SUBCLASS_DRIVER_H - -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include - // // Data table entry update function. // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c index 77abb9c6b5..bbade9bf12 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c index 5eff1d9502..03eb74f9f9 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c index 080c540c13..ef52513d58 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c index dde795e88d..be53e39a71 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c index aa428f1785..ddd749bfdb 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c index 20e55c33ff..8c00350f64 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c index ca0e9b4ff0..86ae7e4de6 100644 --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "MiscSubclassDriver.h" // diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/CommonHeader.h b/Nt32Pkg/RealTimeClockRuntimeDxe/CommonHeader.h deleted file mode 100644 index 282122e9db..0000000000 --- a/Nt32Pkg/RealTimeClockRuntimeDxe/CommonHeader.h +++ /dev/null @@ -1,36 +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 -// -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include - -#endif diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c index 59adc64952..9c3cc00077 100644 --- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c +++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c @@ -19,13 +19,15 @@ Abstract: --*/ +#include +#include +#include +#include +#include +#include +#include -// -// Include common header file for this module. -// -#include "CommonHeader.h" - BOOLEAN DayValid ( IN EFI_TIME *Time diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf index cb184435a6..fb53d6c6df 100644 --- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf +++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = RealTimeClock @@ -36,52 +31,21 @@ # VALID_ARCHITECTURES = IA32 # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] RealTimeClock.c - CommonHeader.h - - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] UefiBootServicesTableLib WinNtLib UefiDriverEntryPoint DebugLib - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiRealTimeClockArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED [depex] - TRUE \ No newline at end of file + TRUE + \ No newline at end of file diff --git a/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h b/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h deleted file mode 100644 index 20a8ba90c5..0000000000 --- a/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h +++ /dev/null @@ -1,36 +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 -// -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include - -#endif diff --git a/Nt32Pkg/ResetRuntimeDxe/Reset.inf b/Nt32Pkg/ResetRuntimeDxe/Reset.inf index dd4c5ec030..d586a81e3b 100644 --- a/Nt32Pkg/ResetRuntimeDxe/Reset.inf +++ b/Nt32Pkg/ResetRuntimeDxe/Reset.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Reset @@ -36,50 +31,18 @@ # VALID_ARCHITECTURES = IA32 # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] - Reset.dxs reset.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] UefiBootServicesTableLib WinNtLib UefiDriverEntryPoint DebugLib - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiResetArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED diff --git a/Nt32Pkg/ResetRuntimeDxe/reset.c b/Nt32Pkg/ResetRuntimeDxe/reset.c index a4df52f19a..2aba432e82 100644 --- a/Nt32Pkg/ResetRuntimeDxe/reset.c +++ b/Nt32Pkg/ResetRuntimeDxe/reset.c @@ -19,13 +19,15 @@ Abstract: --*/ +#include +#include +#include +#include +#include +#include +#include -// -// Include common header file for this module. -// -#include "CommonHeader.h" - EFI_STATUS EFIAPI InitializeNtReset ( diff --git a/Nt32Pkg/TimerDxe/CommonHeader.h b/Nt32Pkg/TimerDxe/CommonHeader.h deleted file mode 100644 index e497b7c353..0000000000 --- a/Nt32Pkg/TimerDxe/CommonHeader.h +++ /dev/null @@ -1,37 +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 -// -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include - -#endif diff --git a/Nt32Pkg/TimerDxe/Timer.c b/Nt32Pkg/TimerDxe/Timer.c index 363f1047d1..3997c5f913 100644 --- a/Nt32Pkg/TimerDxe/Timer.c +++ b/Nt32Pkg/TimerDxe/Timer.c @@ -23,11 +23,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Timer.h" // diff --git a/Nt32Pkg/TimerDxe/Timer.h b/Nt32Pkg/TimerDxe/Timer.h index 566ab95a87..ed1d00a23f 100644 --- a/Nt32Pkg/TimerDxe/Timer.h +++ b/Nt32Pkg/TimerDxe/Timer.h @@ -25,13 +25,16 @@ Abstract: #define _TIMER_H_ +#include +#include +#include +#include +#include +#include +#include +#include -// -// Include common header file for this module. -// -#include "CommonHeader.h" - // // Legal timer value range in 100 ns units // diff --git a/Nt32Pkg/TimerDxe/Timer.inf b/Nt32Pkg/TimerDxe/Timer.inf index d18584f03d..12edfde81f 100644 --- a/Nt32Pkg/TimerDxe/Timer.inf +++ b/Nt32Pkg/TimerDxe/Timer.inf @@ -16,11 +16,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Timer @@ -38,62 +33,24 @@ # VALID_ARCHITECTURES = IA32 # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] - Timer.dxs Timer.c Timer.h - 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] UefiBootServicesTableLib WinNtLib UefiDriverEntryPoint DebugLib - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiCpuArchProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiTimerArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED -################################################################################ -# -# Dependency Expression Section - list of Dependency expressions that are required for -# this module. -# -################################################################################ - [Depex] - gEfiCpuArchProtocolGuid \ No newline at end of file + gEfiCpuArchProtocolGuid + \ No newline at end of file -- 2.39.2