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 (file)
index 8202791..0000000
--- a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <FrameworkDxe.h>\r
-#include <WinNtDxe.h>\r
-\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/Cpu.h>\r
-#include <Protocol/DataHub.h>\r
-#include <Protocol/HiiFramework.h>\r
-#include <Guid/DataHubRecords.h>\r
-#include <Protocol/CpuIo.h>\r
-#include <Protocol/WinNtIo.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/HiiLibFramework.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index 499ec2da8c5212a06e1d3813944e8c40458905a4..a3317526aa770c11a53e0ec22760205d6a968838 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -22,10 +22,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
 \r
 #include "CpuDriver.h"\r
 \r

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.inf b/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
index e659b7b1ad072c076fc1a478ea2f441ee1c6a1cf..bb3c8537b925d87aa9320bb43598715987b51386 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Cpu\r
@@ -36,40 +31,17 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   Cpu.dxs\r
   CpuIo.c\r
   Cpu.c\r
   CpuDriver.h\r
   Strings.uni\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r
@@ -78,27 +50,12 @@
   HiiLibFramework\r
   DebugLib\r
 \r
-\r
-################################################################################\r
-#\r
-# Guid C Name Section - list of Guids that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Guids]\r
   gEfiWinNtCPUSpeedGuid                         # SOMETIMES_CONSUMED\r
   gEfiWinNtCPUModelGuid                         # SOMETIMES_CONSUMED\r
   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED\r
   gEfiProcessorProducerGuid                     # SOMETIMES_CONSUMED\r
 \r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED\r
   gEfiDataHubProtocolGuid                       # PROTOCOL SOMETIMES_CONSUMED\r
@@ -107,12 +64,5 @@
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED\r
   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED\r
 \r
-################################################################################\r
-#\r
-# Dependency Expression Section - list of Dependency expressions that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r
 [Depex]\r
   gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid\r

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
index 781d8c65df276dc4d5b54cfd29774b00a4d9489d..15316fb689c2d6a367ce22c8f3afa8320fb32015 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -23,11 +23,20 @@ Abstract:
 #define _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_\r
 \r
 \r
+#include <FrameworkDxe.h>\r
+#include <Protocol/Cpu.h>\r
+#include <Protocol/DataHub.h>\r
+#include <Protocol/HiiFramework.h>\r
+#include <Guid/DataHubRecords.h>\r
+#include <Protocol/CpuIo.h>\r
+#include <Protocol/WinNtIo.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/HiiLibFramework.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
 \r
 extern UINT8  CpuStrings[];\r
 \r

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
index a3b7c59e91ba582b78aa278ba659f7e98216c359..4aaa431d540582b8d1a35d51f9b4b2acbb21c9f5 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
@@ -23,11 +23,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include <CpuDriver.h>\r
 \r
 #define IA32_MAX_IO_ADDRESS   0xFFFF\r

diff --git a/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h b/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h
deleted file mode 100644 (file)
index c6f575f..0000000
--- a/Nt32Pkg/Library/DxeWinNtLib/CommonHeader.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation.\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-#include <WinNtDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/WinNtLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/HobLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf b/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
index dc22accf00fc7ee83ad881bf3bbdc654eb921f79..1e487349b918adfaff52b3496cd9d1749eeef992 100644 (file)
--- a/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
+++ b/Nt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.inf
@@ -13,12 +13,6 @@
 #\r
 #\r
 #**/\r
-\r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeWinNtLib\r
@@ -39,36 +33,13 @@
 #  HOB Guid C Name: gEfiWinNtThunkProtocolGuid Hob Type: GUID_EXTENSION\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   WinNtLib.c\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   Nt32Pkg/Nt32Pkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
 [LibraryClasses]\r
   HobLib\r
   DebugLib\r

diff --git a/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c b/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c
index ef04eca44bdd7dd8e1570b2bf02fb15c37aef0fb..77efbb6a873b1330d1f68d952f6802778e9f1373 100644 (file)
--- a/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c
+++ b/Nt32Pkg/Library/DxeWinNtLib/WinNtLib.c
@@ -19,13 +19,13 @@ Abstract:
 \r
 --*/\r
 \r
+#include <PiDxe.h>\r
+#include <WinNtDxe.h>\r
+#include <Library/WinNtLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/HobLib.h>\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 EFI_WIN_NT_THUNK_PROTOCOL *gWinNt;\r
 \r
 EFI_STATUS\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
index de11d2eacfeadf7866a8679872932353783db528..78b2e99661c3723f8a1744ac0f5b18c9ac7f8426 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -19,12 +19,8 @@ Abstract:
   option.\r
 \r
 --*/\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
 \r
-#include "Performance.h"\r
+#include <EdkGenericBdsLibInternal.h>\r
 \r
 BOOLEAN mEnumBootDevice = FALSE;\r
 \r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
index cb51488795efb3b997f48dfa828a73ce12a30a1a..6362c20b70aa9d2b0033c4f0680b1bd12233a2a2 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
@@ -19,10 +19,7 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <EdkGenericBdsLibInternal.h>\r
 \r
 VOID\r
 BdsLibConnectAll (\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
index 7a88792d72a62d9ac1569888af2f86731e178787..4dedf1d7ff2c15e148460035128d3897b2b1b1e1 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConsole.c
@@ -19,10 +19,7 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <EdkGenericBdsLibInternal.h>\r
 \r
 BOOLEAN\r
 IsNvNeed (\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index 819e926290066ded8ab942e490fdeaf3c7a3704e..13ec89f501b2ea62977b7013526b341d9fdbda28 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -19,10 +19,8 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <EdkGenericBdsLibInternal.h>\r
+\r
 \r
 #define MAX_STRING_LEN        200\r
 static BOOLEAN   mFeaturerSwitch = TRUE;\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c b/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
index d971705ae6060ec156ca4b6a35043b9ee62e0045..70ad40e8c9e0a007cb8de4d02a21c1eddb5eab79 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/DevicePath.c
@@ -20,10 +20,7 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <EdkGenericBdsLibInternal.h>\r
 \r
 EFI_GUID  mEfiWinNtThunkProtocolGuid  = EFI_WIN_NT_THUNK_PROTOCOL_GUID;\r
 EFI_GUID  mEfiWinNtUgaGuid            = EFI_WIN_NT_UGA_GUID;\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
index ba2e38b9c3256b815423d40f1d4c931025831db7..ca25796624b64be7ec4ab454b84c5dca2941f737 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
@@ -17,11 +17,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = EdkGenericBdsLib\r
@@ -39,29 +34,14 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   BdsMisc.c\r
   Performance.c\r
-  Performance.h\r
   DevicePath.c\r
   BdsConnect.c\r
   BdsConsole.c\r
   BdsBoot.c\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
+  EdkGenericBdsLib.h\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -69,14 +49,6 @@
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   Nt32Pkg/Nt32Pkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
 [LibraryClasses]\r
   PeCoffLib\r
   PerformanceLib\r
@@ -92,26 +64,11 @@
   UefiLib\r
   BaseLib\r
 \r
-\r
-################################################################################\r
-#\r
-# Guid C Name Section - list of Guids that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Guids]\r
   gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED\r
   gEfiGenericPlatformVariableGuid               # ALWAYS_CONSUMED\r
   gEfiShellFileGuid                             # ALWAYS_CONSUMED\r
 \r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiLoadFileProtocolGuid                      # PROTOCOL SOMETIMES_CONSUMED\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
new file mode 100644 (file)
index 0000000..9d07a5c
--- /dev/null
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
@@ -0,0 +1,96 @@
+/**@file\r
+  Common header file shared by all source files.\r
+\r
+  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
+\r
+  Copyright (c) 2006 - 2007, Intel Corporation.\r
+  All rights reserved. This program and the accompanying materials\r
+   are licensed and made available under the terms and conditions of the BSD License\r
+   which accompanies this distribution. The full text of the license may be found at\r
+   http://opensource.org/licenses/bsd-license.php\r
+   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+**/\r
+\r
+#ifndef __EDK_GENERIC_BDS_LIB_INTERNAL_H_\r
+#define __EDK_GENERIC_BDS_LIB_INTERNAL_H_\r
+\r
+\r
+//\r
+// The package level header files this module uses\r
+//\r
+#include <PiDxe.h>\r
+#include <WinNtDxe.h>\r
+//\r
+// The protocols, PPI and GUID defintions for this module\r
+//\r
+#include <Protocol/Cpu.h>\r
+#include <Protocol/SimpleTextIn.h>\r
+#include <Protocol/SimpleTextOut.h>\r
+#include <Protocol/LoadedImage.h>\r
+#include <Guid/GenericPlatformVariable.h>\r
+#include <Guid/ShellFile.h>\r
+#include <Protocol/SimpleFileSystem.h>\r
+#include <Protocol/BlockIo.h>\r
+#include <Protocol/SimpleNetwork.h>\r
+#include <Protocol/AcpiS3Save.h>\r
+#include <Guid/GlobalVariable.h>\r
+#include <Protocol/FormBrowserFramework.h>\r
+#include <Protocol/LegacyBios.h>\r
+#include <Protocol/DriverBinding.h>\r
+#include <Protocol/LoadFile.h>\r
+#include <Protocol/DevicePath.h>\r
+#include <Protocol/FirmwareVolume.h>\r
+#include <Protocol/Performance.h>\r
+#include <Protocol/WinNtIo.h>\r
+#include <Guid/PcAnsi.h>\r
+\r
+//\r
+// The Library classes this module consumes\r
+//\r
+#include <Library/EdkGenericBdsLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/DxeServicesTableLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/PerformanceLib.h>\r
+#include <Library/PeCoffLib.h>\r
+\r
+#define PERF_TOKEN_LENGTH       28\r
+#define PERF_PEI_ENTRY_MAX_NUM  50\r
+\r
+typedef struct {\r
+  CHAR8   Token[PERF_TOKEN_LENGTH];\r
+  UINT32  Duration;\r
+} PERF_DATA;\r
+\r
+typedef struct {\r
+  UINT64        BootToOs;\r
+  UINT64        S3Resume;\r
+  UINT32        S3EntryNum;\r
+  PERF_DATA     S3Entry[PERF_PEI_ENTRY_MAX_NUM];\r
+  UINT64        CpuFreq;\r
+  UINT64        BDSRaw;\r
+  UINT32        Count;\r
+  UINT32        Signiture;\r
+} PERF_HEADER;\r
+\r
+VOID\r
+WriteBootToOsPerformanceData (\r
+  VOID\r
+  );\r
+\r
+VOID\r
+ClearDebugRegisters (\r
+  VOID\r
+  );\r
+\r
+\r
+#endif\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c
index e3013ebbb1279deffad5781ea6df93746abdf7ef..7d581b45f0eb43db66356a6b415a2ef0de0c73f8 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.c
@@ -21,12 +21,7 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-#include "Performance.h"\r
+#include <EdkGenericBdsLibInternal.h>\r
 \r
 \r
 STATIC\r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h b/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h
deleted file mode 100644 (file)
index cc05d28..0000000
--- a/Nt32Pkg/Library/EdkGenericBdsLib/Performance.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-  Performance.h\r
-\r
-Abstract:\r
-\r
-  This file included the performance relete function header and \r
-  definition.\r
-\r
---*/\r
-\r
-#ifndef _PERF_H_\r
-#define _PERF_H_\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-#define PERF_TOKEN_LENGTH       28\r
-#define PERF_PEI_ENTRY_MAX_NUM  50\r
-\r
-typedef struct {\r
-  CHAR8   Token[PERF_TOKEN_LENGTH];\r
-  UINT32  Duration;\r
-} PERF_DATA;\r
-\r
-typedef struct {\r
-  UINT64        BootToOs;\r
-  UINT64        S3Resume;\r
-  UINT32        S3EntryNum;\r
-  PERF_DATA     S3Entry[PERF_PEI_ENTRY_MAX_NUM];\r
-  UINT64        CpuFreq;\r
-  UINT64        BDSRaw;\r
-  UINT32        Count;\r
-  UINT32        Signiture;\r
-} PERF_HEADER;\r
-\r
-VOID\r
-WriteBootToOsPerformanceData (\r
-  VOID\r
-  );\r
-\r
-VOID\r
-ClearDebugRegisters (\r
-  VOID\r
-  );\r
-\r
-#endif\r

diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h
deleted file mode 100644 (file)
index 9804608..0000000
--- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/CommonHeader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiPei.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Guid/PeiPeCoffLoader.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/PeCoffLoaderLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c
index 6d273f47e6262b12b3486f53f29cef42ebf26247..8eaa2aba432bbd929e07f62830c832c19f0842c8 100644 (file)
--- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c
+++ b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c
@@ -20,13 +20,11 @@ Abstract:
 \r
 --*/\r
 \r
+#include <PiPei.h>\r
+#include <Guid/PeiPeCoffLoader.h>\r
+#include <Library/PeCoffLoaderLib.h>\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 EFI_PEI_PE_COFF_LOADER_PROTOCOL  *mPeiEfiPeiPeCoffLoader;\r
 \r
 EFI_STATUS\r

diff --git a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
index a24b544d2308f0b08526cde6ba1d14563e006dfa..e4d384ae820c8caeba4bdbeebc25ef2b6355f65a 100644 (file)
--- a/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
+++ b/Nt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Nt32PeCoffLoaderLib\r
@@ -37,35 +32,13 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   Nt32PeCoffLoader.c\r
-  CommonHeader.h\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# PPI C Name Section - list of PPI and PPI Notify C Names that this module\r
-#                      uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Ppis]\r
   gEfiPeiPeCoffLoaderGuid                       # PPI ALWAYS_CONSUMED\r
 \r

diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h
deleted file mode 100644 (file)
index 16f6375..0000000
--- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/CommonHeader.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiPei.h>\r
-#include <IndustryStandard/PeImage.h>\r
-#include <WinNtPeim.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Ppi/NtPeiLoadFile.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/PeCoffGetEntryPointLib.h>\r
-#include <Library/PeiServicesLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
index d7fd32c3522de3bc4d733b53e312d6f71a0e1a42..705aa2fa862a17d8138b25bd6bc1082747928663 100644 (file)
--- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
+++ b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/Nt32PeiPeCoffGetEntryPointLib.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = EdkNt32PeiPeCoffGetEntryPointLib\r
@@ -36,47 +31,16 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   PeCoffGetEntryPoint.c\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   Nt32Pkg/Nt32Pkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
 [LibraryClasses]\r
   PeiServicesLib\r
 \r
-\r
-################################################################################\r
-#\r
-# PPI C Name Section - list of PPI and PPI Notify C Names that this module\r
-#                      uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Ppis]\r
   gNtPeiLoadFilePpiGuid                         # PPI ALWAYS_CONSUMED\r
 \r

diff --git a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
index fd8f739a85e36bc96445fea9bc1f163818aac08a..4f3c505cdd964a9736993bfa514af7df7aa70ead 100644 (file)
--- a/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
+++ b/Nt32Pkg/Library/Nt32PeiPeCoffGetEntryPointLib/PeCoffGetEntryPoint.c
@@ -21,11 +21,13 @@ Revision History
 \r
 --*/\r
 \r
+#include <PiPei.h>\r
+#include <IndustryStandard/PeImage.h>\r
+#include <WinNtPeim.h>\r
+#include <Ppi/NtPeiLoadFile.h>\r
+#include <Library/PeCoffGetEntryPointLib.h>\r
+#include <Library/PeiServicesLib.h>\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
 \r
 RETURN_STATUS\r
 EFIAPI\r

diff --git a/Nt32Pkg/MetronomeDxe/CommonHeader.h b/Nt32Pkg/MetronomeDxe/CommonHeader.h
deleted file mode 100644 (file)
index 7eb12c1..0000000
--- a/Nt32Pkg/MetronomeDxe/CommonHeader.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-#include <WinNtDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/Metronome.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/WinNtLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/MetronomeDxe/Metronome.c b/Nt32Pkg/MetronomeDxe/Metronome.c
index b02741b45cf79f08f687039f01513afdf701e9dd..394ca6e717af0bd4258919d0fae8769de1adbfb6 100644 (file)
--- a/Nt32Pkg/MetronomeDxe/Metronome.c
+++ b/Nt32Pkg/MetronomeDxe/Metronome.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Metronome.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MetronomeDxe/Metronome.h b/Nt32Pkg/MetronomeDxe/Metronome.h
index b2b40eeadcd94b3ab88289526f5cca5281c5b8e6..cf2b52bc48a7e2d83a775ca2d65224760bf2abab 100644 (file)
--- a/Nt32Pkg/MetronomeDxe/Metronome.h
+++ b/Nt32Pkg/MetronomeDxe/Metronome.h
@@ -22,13 +22,16 @@ Abstract:
 #ifndef _NT_THUNK_METRONOME_H_\r
 #define _NT_THUNK_METRONOME_H_\r
 \r
+#include <PiDxe.h>\r
+#include <WinNtDxe.h>\r
+#include <Protocol/Metronome.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/WinNtLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 //\r
 // Period of on tick in 100 nanosecond units\r
 //\r

diff --git a/Nt32Pkg/MetronomeDxe/Metronome.inf b/Nt32Pkg/MetronomeDxe/Metronome.inf
index 15aec0ea1b8baf093d1892f479efb670a9e42d2d..87ca79706ceb72d49506a7bd48390091c09c73e5 100644 (file)
--- a/Nt32Pkg/MetronomeDxe/Metronome.inf
+++ b/Nt32Pkg/MetronomeDxe/Metronome.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Metronome\r
@@ -36,36 +31,13 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   Metronome.h\r
   Metronome.c\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   WinNtLib\r
@@ -73,16 +45,9 @@
   DebugLib\r
   BaseLib\r
 \r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiMetronomeArchProtocolGuid                 # PROTOCOL ALWAYS_PRODUCED\r
 \r
 [depex]\r
-  TRUE
\ No newline at end of file
+  TRUE\r
+  
\ No newline at end of file

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h b/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h
deleted file mode 100644 (file)
index 93d7ac1..0000000
--- a/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <FrameworkDxe.h>\r
-#include <WinNtDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Guid/DataHubRecords.h>\r
-#include <Protocol/DataHub.h>\r
-#include <Protocol/WinNtIo.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/BaseLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/HiiLibFramework.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/DevicePathLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
index b7594f703a8e2c948bd94318c2085fa1f5682b8b..9536c88aa494916ea333ead0bab5d05857ce5729 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
index f2363f3c66c3bacd3d085a2bd82ae2a58d02d7c4..3187aba2a07b6334191728312ffb80c3c64ab172 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBiosVendorData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
index 8741468698334c8c7d3493f9ed87c5c7859e4013..1bf280b1416dd69eea165d3d50f93fb27b05291b 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBootInformationData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
index 3e7d340780644135a3996d93409b1a583f21c261..5c657eef15611bdfdd001b59209c0d34e4ba3d83 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscChassisManufacturerData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h
index 3880aa49fb3b1e3d686c4952fe08f630ea2dcb7a..dd78a7af12f571f10b49f482382934672c7eb318 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscDevicePath.h
@@ -24,11 +24,6 @@ Abstract:
 #define _MISC_DEVICE_PATH_H\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #pragma pack(1)\r
 //\r
 // USB\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
index b3d2c2eceb36bcc56283e2ea7dd37a01716f47e9..008425987b064b12173eec5a0764ade0a83ef4e3 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscNumberOfInstallableLanguagesData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c
index 7d890332813520069fbd0601404a92b4a310f909..fdfbd1f2e1afa6a4ca2e229d0057e07315ce1c43 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscOemStringData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
index e961df7aea75ee098aafab7fe4978093967dcc04..d886a9d8c40185e09b01945f73830302d26fc4a0 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
index d493ef0bc755a5f16d73e4ee5216cfeaadd2b6f6..35351aa2df6ecf44b695cba8769d0ae0be21e519 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscPortInternalConnectorDesignatorFunction.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
index 65bd0b5049394f0d5439e125b7c545b8a6d62ba3..6e0c1bb5ad454cf2bb4c97a1da327a9e332bfb79 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscResetCapabilitiesData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
index 801b2c3bf1ea26a3ff61238aa9bb99a62ece77fd..1374d7b135e2b6c26aaf0c4a784da35dd3af1dcd 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
@@ -22,15 +22,23 @@ Abstract:
 #ifndef _MISC_SUBCLASS_DRIVER_H\r
 #define _MISC_SUBCLASS_DRIVER_H\r
 \r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <FrameworkDxe.h>\r
+#include <WinNtDxe.h>\r
+#include <Guid/DataHubRecords.h>\r
+#include <Protocol/DataHub.h>\r
+#include <Protocol/WinNtIo.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/HiiLibFramework.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
 \r
 #include <MiscDevicePath.h>\r
 \r
-\r
 //\r
 // Data table entry update function.\r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
index 77abb9c6b567756477ed409a399746bb261cf7b3..bbade9bf124a324999474119f3402a12ddb2f6c6 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverDataTable.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 5eff1d95025d143ff56b30795dfab62a4e9ade7d..03eb74f9f908b3dc7340cc278ec66f29ae8a6946 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 \r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
index 080c540c1333c383793a87f7373ac57705694ac0..ef52513d58daab66a34ca58da73aea8f1c5331d3 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemLanguageStringData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
index dde795e88da36dee840932bc069daf2c2440d00c..be53e39a714e55d25bf414a0dda5920ea5950b5c 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
index aa428f178556dabacfcf6966f25ba605882fc4c6..ddd749bfdb76d424b58c5f32f0442daee6764983 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemManufacturerFunction.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
index 20e55c33ffe4eff6473bee8e221675f42c0fab4c..8c00350f64d86b65153f69314f1ae11a88bfd6a3 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemOptionStringData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
index ca0e9b4ff0d2821197224065501849e3a8cc2357..86ae7e4de6d5197585ff0bce463d88b9cd641fa0 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "MiscSubclassDriver.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/CommonHeader.h b/Nt32Pkg/RealTimeClockRuntimeDxe/CommonHeader.h
deleted file mode 100644 (file)
index 282122e..0000000
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/CommonHeader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-#include <WinNtDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/RealTimeClock.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/WinNtLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
index 59adc649524f5d6b1b1fa5f2f93d67d36419a37a..9c3cc0007771aa561e9e7925169ebc40c7e248f0 100644 (file)
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
@@ -19,13 +19,15 @@ Abstract:
 \r
 --*/\r
 \r
+#include <PiDxe.h>\r
+#include <WinNtDxe.h>\r
+#include <Protocol/RealTimeClock.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/WinNtLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 BOOLEAN\r
 DayValid (\r
   IN  EFI_TIME  *Time\r

diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
index cb184435a69b8e6aeb15aaf35bc6f7a4f2722b3b..fb53d6c6dff0739bb48642c771b0066800f4fa6b 100644 (file)
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = RealTimeClock\r
@@ -36,52 +31,21 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   RealTimeClock.c\r
-  CommonHeader.h\r
-\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   WinNtLib\r
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiRealTimeClockArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED\r
 \r
 [depex]\r
-  TRUE
\ No newline at end of file
+  TRUE\r
+  
\ No newline at end of file

diff --git a/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h b/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h
deleted file mode 100644 (file)
index 20a8ba9..0000000
--- a/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-#include <WinNtDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/Reset.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/WinNtLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/ResetRuntimeDxe/Reset.inf b/Nt32Pkg/ResetRuntimeDxe/Reset.inf
index dd4c5ec0308cb1b1fe4f0d665ea71a3b9d8b7668..d586a81e3bb325f2cf27c37ab98ad957c17124d0 100644 (file)
--- a/Nt32Pkg/ResetRuntimeDxe/Reset.inf
+++ b/Nt32Pkg/ResetRuntimeDxe/Reset.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Reset\r
@@ -36,50 +31,18 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
-  Reset.dxs\r
   reset.c\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   WinNtLib\r
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiResetArchProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED\r
 \r

diff --git a/Nt32Pkg/ResetRuntimeDxe/reset.c b/Nt32Pkg/ResetRuntimeDxe/reset.c
index a4df52f19a3538b4f2d00814a6d6637fe1b87510..2aba432e827c4a5137414fdaf1a34f2c10bace6a 100644 (file)
--- a/Nt32Pkg/ResetRuntimeDxe/reset.c
+++ b/Nt32Pkg/ResetRuntimeDxe/reset.c
@@ -19,13 +19,15 @@ Abstract:
 \r
 --*/\r
 \r
+#include <PiDxe.h>\r
+#include <WinNtDxe.h>\r
+#include <Protocol/Reset.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/WinNtLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 InitializeNtReset (\r

diff --git a/Nt32Pkg/TimerDxe/CommonHeader.h b/Nt32Pkg/TimerDxe/CommonHeader.h
deleted file mode 100644 (file)
index e497b7c..0000000
--- a/Nt32Pkg/TimerDxe/CommonHeader.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-#include <WinNtDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/Timer.h>\r
-#include <Protocol/Cpu.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/WinNtLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-\r
-#endif\r

diff --git a/Nt32Pkg/TimerDxe/Timer.c b/Nt32Pkg/TimerDxe/Timer.c
index 363f1047d18cd09bf813c74693bdb221a5340c5d..3997c5f913f5291e8d23bdebbe080bb18623cb5b 100644 (file)
--- a/Nt32Pkg/TimerDxe/Timer.c
+++ b/Nt32Pkg/TimerDxe/Timer.c
@@ -23,11 +23,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Timer.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/TimerDxe/Timer.h b/Nt32Pkg/TimerDxe/Timer.h
index 566ab95a87e25656a7d9db53a44a77908b90c7c7..ed1d00a23fb4ff97ea9069b031fe479d4d48e63c 100644 (file)
--- a/Nt32Pkg/TimerDxe/Timer.h
+++ b/Nt32Pkg/TimerDxe/Timer.h
@@ -25,13 +25,16 @@ Abstract:
 #define _TIMER_H_\r
 \r
 \r
+#include <PiDxe.h>\r
+#include <WinNtDxe.h>\r
+#include <Protocol/Timer.h>\r
+#include <Protocol/Cpu.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/WinNtLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 //\r
 // Legal timer value range in 100 ns units\r
 //\r

diff --git a/Nt32Pkg/TimerDxe/Timer.inf b/Nt32Pkg/TimerDxe/Timer.inf
index d18584f03d1d225313da5f1bee27c7cddd28d0fb..12edfde81fc6f95b776b0ccc887318175ec54401 100644 (file)
--- a/Nt32Pkg/TimerDxe/Timer.inf
+++ b/Nt32Pkg/TimerDxe/Timer.inf
@@ -16,11 +16,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Timer\r
@@ -38,62 +33,24 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
-  Timer.dxs\r
   Timer.c\r
   Timer.h\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   Nt32Pkg/Nt32Pkg.dec\r
 \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   WinNtLib\r
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED\r
   gEfiTimerArchProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED\r
 \r
-################################################################################\r
-#\r
-# Dependency Expression Section - list of Dependency expressions that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r
 [Depex]\r
-  gEfiCpuArchProtocolGuid
\ No newline at end of file
+  gEfiCpuArchProtocolGuid\r
+  
\ No newline at end of file