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
diff --git a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
deleted file mode 100644
index 8202791..0000000
--- 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 <FrameworkDxe.h>
-#include <WinNtDxe.h>
-
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Protocol/Cpu.h>
-#include <Protocol/DataHub.h>
-#include <Protocol/HiiFramework.h>
-#include <Guid/DataHubRecords.h>
-#include <Protocol/CpuIo.h>
-#include <Protocol/WinNtIo.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/DebugLib.h>
-#include <Library/HiiLibFramework.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-
-#endif
diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index 499ec2d..a331752 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -22,10 +22,6 @@
--*/
-//
-// 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 e659b7b..bb3c853 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 781d8c6..15316fb 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -23,11 +23,20 @@
#define _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_
+#include <FrameworkDxe.h>
+#include <Protocol/Cpu.h>
+#include <Protocol/DataHub.h>
+#include <Protocol/HiiFramework.h>
+#include <Guid/DataHubRecords.h>
+#include <Protocol/CpuIo.h>
+#include <Protocol/WinNtIo.h>
+#include <Library/DebugLib.h>
+#include <Library/HiiLibFramework.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
-//
-// 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 a3b7c59..4aaa431 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
@@ -23,11 +23,6 @@
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
#include <CpuDriver.h>
#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 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 <PiDxe.h>
-#include <WinNtDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-//
-// The Library classes this module consumes
-//
-#include <Library/WinNtLib.h>
-#include <Library/DebugLib.h>
-#include <Library/HobLib.h>
-
-#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 @@
--*/
+#include <PiDxe.h>
+#include <WinNtDxe.h>
+#include <Library/WinNtLib.h>
+#include <Library/DebugLib.h>
+#include <Library/HobLib.h>
-//
-// 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 @@
option.
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-#include "Performance.h"
+#include <EdkGenericBdsLibInternal.h>
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 @@
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <EdkGenericBdsLibInternal.h>
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 @@
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <EdkGenericBdsLibInternal.h>
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 @@
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <EdkGenericBdsLibInternal.h>
+
#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 @@
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <EdkGenericBdsLibInternal.h>
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 <PiDxe.h>
+#include <WinNtDxe.h>
+//
+// The protocols, PPI and GUID defintions for this module
+//
+#include <Protocol/Cpu.h>
+#include <Protocol/SimpleTextIn.h>
+#include <Protocol/SimpleTextOut.h>
+#include <Protocol/LoadedImage.h>
+#include <Guid/GenericPlatformVariable.h>
+#include <Guid/ShellFile.h>
+#include <Protocol/SimpleFileSystem.h>
+#include <Protocol/BlockIo.h>
+#include <Protocol/SimpleNetwork.h>
+#include <Protocol/AcpiS3Save.h>
+#include <Guid/GlobalVariable.h>
+#include <Protocol/FormBrowserFramework.h>
+#include <Protocol/LegacyBios.h>
+#include <Protocol/DriverBinding.h>
+#include <Protocol/LoadFile.h>
+#include <Protocol/DevicePath.h>
+#include <Protocol/FirmwareVolume.h>
+#include <Protocol/Performance.h>
+#include <Protocol/WinNtIo.h>
+#include <Guid/PcAnsi.h>
+
+//
+// The Library classes this module consumes
+//
+#include <Library/EdkGenericBdsLib.h>
+#include <Library/BaseLib.h>
+#include <Library/UefiLib.h>
+#include <Library/DxeServicesTableLib.h>
+#include <Library/DebugLib.h>
+#include <Library/PrintLib.h>
+#include <Library/HobLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiRuntimeServicesTableLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/PerformanceLib.h>
+#include <Library/PeCoffLib.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/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 @@
--*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
-#include "Performance.h"
+#include <EdkGenericBdsLibInternal.h>
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 <PiPei.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Guid/PeiPeCoffLoader.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/PeCoffLoaderLib.h>
-
-#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 @@
--*/
+#include <PiPei.h>
+#include <Guid/PeiPeCoffLoader.h>
+#include <Library/PeCoffLoaderLib.h>
-//
-// 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 <PiPei.h>
-#include <IndustryStandard/PeImage.h>
-#include <WinNtPeim.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Ppi/NtPeiLoadFile.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/PeCoffGetEntryPointLib.h>
-#include <Library/PeiServicesLib.h>
-
-#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 @@
--*/
+#include <PiPei.h>
+#include <IndustryStandard/PeImage.h>
+#include <WinNtPeim.h>
+#include <Ppi/NtPeiLoadFile.h>
+#include <Library/PeCoffGetEntryPointLib.h>
+#include <Library/PeiServicesLib.h>
-//
-// 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 7eb12c1..0000000
--- 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 <PiDxe.h>
-#include <WinNtDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Protocol/Metronome.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/WinNtLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-
-#endif
diff --git a/Nt32Pkg/MetronomeDxe/Metronome.c b/Nt32Pkg/MetronomeDxe/Metronome.c
index b02741b..394ca6e 100644
--- a/Nt32Pkg/MetronomeDxe/Metronome.c
+++ b/Nt32Pkg/MetronomeDxe/Metronome.c
@@ -19,11 +19,6 @@
--*/
-//
-// 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 b2b40ee..cf2b52b 100644
--- a/Nt32Pkg/MetronomeDxe/Metronome.h
+++ b/Nt32Pkg/MetronomeDxe/Metronome.h
@@ -22,14 +22,17 @@
#ifndef _NT_THUNK_METRONOME_H_
#define _NT_THUNK_METRONOME_H_
+#include <PiDxe.h>
+#include <WinNtDxe.h>
+#include <Protocol/Metronome.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/WinNtLib.h>
+#include <Library/UefiBootServicesTableLib.h>
//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
-//
// Period of on tick in 100 nanosecond units
//
#define TICK_PERIOD 2000
diff --git a/Nt32Pkg/MetronomeDxe/Metronome.inf b/Nt32Pkg/MetronomeDxe/Metronome.inf
index 15aec0e..87ca797 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 93d7ac1..0000000
--- 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 <FrameworkDxe.h>
-#include <WinNtDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Guid/DataHubRecords.h>
-#include <Protocol/DataHub.h>
-#include <Protocol/WinNtIo.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-#include <Library/HiiLibFramework.h>
-#include <Library/UefiLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/DevicePathLib.h>
-
-#endif
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
index b7594f7..9536c88 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 f2363f3..3187aba 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 8741468..1bf280b 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 3e7d340..5c657ee 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 3880aa4..dd78a7a 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h
@@ -24,11 +24,6 @@
#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 b3d2c2e..0084259 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 7d89033..fdfbd1f 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 e961df7..d886a9d 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 d493ef0..35351aa 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 65bd0b5..6e0c1bb 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 801b2c3..1374d7b 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
@@ -22,15 +22,23 @@
#ifndef _MISC_SUBCLASS_DRIVER_H
#define _MISC_SUBCLASS_DRIVER_H
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
+#include <FrameworkDxe.h>
+#include <WinNtDxe.h>
+#include <Guid/DataHubRecords.h>
+#include <Protocol/DataHub.h>
+#include <Protocol/WinNtIo.h>
+#include <Library/BaseLib.h>
+#include <Library/DebugLib.h>
+#include <Library/HiiLibFramework.h>
+#include <Library/UefiLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/DevicePathLib.h>
#include <MiscDevicePath.h>
-
//
// Data table entry update function.
//
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
index 77abb9c..bbade9b 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 5eff1d9..03eb74f 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 080c540..ef52513 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 dde795e..be53e39 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 aa428f1..ddd749b 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 20e55c3..8c00350 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 ca0e9b4..86ae7e4 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
@@ -20,11 +20,6 @@
--*/
-//
-// 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 282122e..0000000
--- 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 <PiDxe.h>
-#include <WinNtDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Protocol/RealTimeClock.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/DebugLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/WinNtLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-
-#endif
diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
index 59adc64..9c3cc00 100644
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
@@ -19,13 +19,15 @@
--*/
+#include <PiDxe.h>
+#include <WinNtDxe.h>
+#include <Protocol/RealTimeClock.h>
+#include <Library/DebugLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/WinNtLib.h>
+#include <Library/UefiBootServicesTableLib.h>
-//
-// 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 cb18443..fb53d6c 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 20a8ba9..0000000
--- 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 <PiDxe.h>
-#include <WinNtDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Protocol/Reset.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/DebugLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/WinNtLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-
-#endif
diff --git a/Nt32Pkg/ResetRuntimeDxe/Reset.inf b/Nt32Pkg/ResetRuntimeDxe/Reset.inf
index dd4c5ec..d586a81 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 a4df52f..2aba432 100644
--- a/Nt32Pkg/ResetRuntimeDxe/reset.c
+++ b/Nt32Pkg/ResetRuntimeDxe/reset.c
@@ -19,13 +19,15 @@
--*/
+#include <PiDxe.h>
+#include <WinNtDxe.h>
+#include <Protocol/Reset.h>
+#include <Library/DebugLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/WinNtLib.h>
+#include <Library/UefiBootServicesTableLib.h>
-//
-// 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 e497b7c..0000000
--- 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 <PiDxe.h>
-#include <WinNtDxe.h>
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Protocol/Timer.h>
-#include <Protocol/Cpu.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/DebugLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/WinNtLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-
-#endif
diff --git a/Nt32Pkg/TimerDxe/Timer.c b/Nt32Pkg/TimerDxe/Timer.c
index 363f104..3997c5f 100644
--- a/Nt32Pkg/TimerDxe/Timer.c
+++ b/Nt32Pkg/TimerDxe/Timer.c
@@ -23,11 +23,6 @@
--*/
-//
-// 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 566ab95..ed1d00a 100644
--- a/Nt32Pkg/TimerDxe/Timer.h
+++ b/Nt32Pkg/TimerDxe/Timer.h
@@ -25,14 +25,17 @@
#define _TIMER_H_
+#include <PiDxe.h>
+#include <WinNtDxe.h>
+#include <Protocol/Timer.h>
+#include <Protocol/Cpu.h>
+#include <Library/DebugLib.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/WinNtLib.h>
+#include <Library/UefiBootServicesTableLib.h>
//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
-//
// Legal timer value range in 100 ns units
//
#define TIMER_MINIMUM_VALUE 0
diff --git a/Nt32Pkg/TimerDxe/Timer.inf b/Nt32Pkg/TimerDxe/Timer.inf
index d18584f..12edfde 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