Remove CommonHeader.h for BdsPlatformDxe driver in Nt32Pkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3474 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
index 79f75f68a57e2d3f23fa1ef9cd981f7129dea262..50af22f047a6240b58a3fe40a356635af564b769 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "Generic/BdsString.h"\r
 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "Generic/BdsString.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h
index b5ab5418d3706642d664da6e222c44bfbccdef78..ff4ee6bcccb6e255335d3905a58091808454399d 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h
@@ -22,10 +22,61 @@ Abstract:
 #ifndef _BDS_PLATFORM_H\r
 #define _BDS_PLATFORM_H\r
 \r
 #ifndef _BDS_PLATFORM_H\r
 #define _BDS_PLATFORM_H\r
 \r

+#include <PiDxe.h>\r
+#include <Common/MaxBbsEntries.h>\r
+#include <Protocol/FormCallbackFramework.h>\r
+#include <Protocol/DevicePath.h>\r
+#include <Protocol/LoadFile.h>\r
+#include <Protocol/CpuIo.h>\r
+#include <Protocol/Bds.h>\r
+#include <Protocol/DataHub.h>\r
+#include <Protocol/FormBrowserFramework.h>\r
+#include <Protocol/UgaDraw.h>\r
+#include <Protocol/BlockIo.h>\r
+#include <Protocol/ConsoleControl.h>\r
+#include <Protocol/GenericMemoryTest.h>\r
+#include <Protocol/GraphicsOutput.h>\r
+#include <Protocol/SimpleFileSystem.h>\r
+#include <Protocol/HiiFramework.h>\r
+#include <Protocol/SerialIo.h>\r
+#include <Protocol/LegacyBios.h>\r
+#include <Protocol/Performance.h>\r
+#include <Guid/PcAnsi.h>\r
+#include <Guid/DataHubRecords.h>\r
+#include <Guid/Bmp.h>\r
+#include <Guid/FileInfo.h>\r
+#include <Guid/BootState.h>\r
+#include <Guid/FileSystemVolumeLabelInfo.h>\r
+#include <Guid/GenericPlatformVariable.h>\r
+#include <Guid/GlobalVariable.h>\r
+\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/GraphicsLib.h>\r
+#include <Library/DxeServicesTableLib.h>\r
+#include <Library/PerformanceLib.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/IfrSupportLibFramework.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/EdkGenericBdsLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/HiiLibFramework.h>\r
+#include <Library/PeCoffLib.h>\r
+#include <Library/PcdLib.h>\r
+\r

 //\r
 //\r

-// Include common header file for this module.\r
+// The rest of the includes\r

 //\r
 //\r

-#include "CommonHeader.h"\r
+#include <Common/FirmwareRevision.h>\r
+\r
+extern UINT8 PlatformBdsStrings[];\r

 \r
 #include "IndustryStandard/Pci22.h"\r
 \r
 \r
 #include "IndustryStandard/Pci22.h"\r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
deleted file mode 100644 (file)
index 8f9a6d6..0000000
--- a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
+++ /dev/null
@@ -1,74 +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
-#include <PiDxe.h>\r
-#include <Common/MaxBbsEntries.h>\r
-#include <Protocol/FormCallbackFramework.h>\r
-#include <Protocol/DevicePath.h>\r
-#include <Protocol/LoadFile.h>\r
-#include <Protocol/CpuIo.h>\r
-#include <Protocol/Bds.h>\r
-#include <Protocol/DataHub.h>\r
-#include <Protocol/FormBrowserFramework.h>\r
-#include <Protocol/UgaDraw.h>\r
-#include <Protocol/BlockIo.h>\r
-#include <Protocol/ConsoleControl.h>\r
-#include <Protocol/GenericMemoryTest.h>\r
-#include <Protocol/GraphicsOutput.h>\r
-#include <Protocol/SimpleFileSystem.h>\r
-#include <Protocol/HiiFramework.h>\r
-#include <Protocol/SerialIo.h>\r
-#include <Protocol/LegacyBios.h>\r
-#include <Protocol/Performance.h>\r
-#include <Guid/PcAnsi.h>\r
-#include <Guid/DataHubRecords.h>\r
-#include <Guid/Bmp.h>\r
-#include <Guid/FileInfo.h>\r
-#include <Guid/BootState.h>\r
-#include <Guid/FileSystemVolumeLabelInfo.h>\r
-#include <Guid/GenericPlatformVariable.h>\r
-#include <Guid/GlobalVariable.h>\r
-\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/GraphicsLib.h>\r
-#include <Library/DxeServicesTableLib.h>\r
-#include <Library/PerformanceLib.h>\r
-#include <Library/PrintLib.h>\r
-#include <Library/IfrSupportLibFramework.h>\r
-#include <Library/ReportStatusCodeLib.h>\r
-#include <Library/HobLib.h>\r
-#include <Library/EdkGenericBdsLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/DevicePathLib.h>\r
-#include <Library/HiiLibFramework.h>\r
-#include <Library/PeCoffLib.h>\r
-#include <Library/PcdLib.h>\r
-\r
-//\r
-// The rest of the includes\r
-//\r
-#include <Common/FirmwareRevision.h>\r
-\r
-extern UINT8 PlatformBdsStrings[];\r
-\r
-#endif\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h
index bbd655647a2567536a8cd6a258eb24e5ccd8bb2f..dfb63d5c659662e4cacd8e50b0d1ed6c9693c02d 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h
@@ -24,10 +24,55 @@ Revision History
 #ifndef _BDS_H\r
 #define _BDS_H\r
 \r
 #ifndef _BDS_H\r
 #define _BDS_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+#include <Common/MaxBbsEntries.h>\r
+#include <Protocol/FormCallbackFramework.h>\r
+#include <Protocol/DevicePath.h>\r
+#include <Protocol/LoadFile.h>\r
+#include <Protocol/CpuIo.h>\r
+#include <Protocol/Bds.h>\r
+#include <Protocol/DataHub.h>\r
+#include <Protocol/FormBrowserFramework.h>\r
+#include <Protocol/UgaDraw.h>\r
+#include <Protocol/BlockIo.h>\r
+#include <Protocol/ConsoleControl.h>\r
+#include <Protocol/GenericMemoryTest.h>\r
+#include <Protocol/GraphicsOutput.h>\r
+#include <Protocol/SimpleFileSystem.h>\r
+#include <Protocol/HiiFramework.h>\r
+#include <Protocol/SerialIo.h>\r
+#include <Protocol/LegacyBios.h>\r
+#include <Protocol/Performance.h>\r
+#include <Guid/PcAnsi.h>\r
+#include <Guid/DataHubRecords.h>\r
+#include <Guid/Bmp.h>\r
+#include <Guid/FileInfo.h>\r
+#include <Guid/BootState.h>\r
+#include <Guid/FileSystemVolumeLabelInfo.h>\r
+#include <Guid/GenericPlatformVariable.h>\r
+#include <Guid/GlobalVariable.h>\r
+\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/GraphicsLib.h>\r
+#include <Library/DxeServicesTableLib.h>\r
+#include <Library/PerformanceLib.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/IfrSupportLibFramework.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/EdkGenericBdsLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/HiiLibFramework.h>\r
+#include <Library/PeCoffLib.h>\r
+#include <Library/PcdLib.h>\r
+\r

 \r
 //\r
 // Bds AP Context data\r
 \r
 //\r
 // Bds AP Context data\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c b/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
index d2dab38e3a4a821429ed2c0da30f1aa9cc9cf612..6979db006c80a501ff4aba5573ced08e8fbc2673 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "FrontPage.h"\r
 #include "Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "FrontPage.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c
index bc4de6cb9c83cbc6fc072e9581c9f0e96c9e78d6..37c0475ba78ef6542f15661dd640a9ab5aed4370 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c
@@ -21,11 +21,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "BBSsupport.h"\r
 \r
 EFI_DEVICE_PATH_PROTOCOL  EndDevicePath[] = {\r
 #include "BBSsupport.h"\r
 \r
 EFI_DEVICE_PATH_PROTOCOL  EndDevicePath[] = {\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.h
index 685c66a4ee8d87ba14d4e80eee9e80985fa02c6d..663fd0a0988148773f742eac0cf0ad861146ab9b 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _EFI_BDS_BBS_SUPPORT_H\r
 #define _EFI_BDS_BBS_SUPPORT_H\r
 \r
 #ifndef _EFI_BDS_BBS_SUPPORT_H\r
 #define _EFI_BDS_BBS_SUPPORT_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/BootMaint/BootMaint.h"\r
 \r
 #if   defined (MDE_CPU_IA32)\r
 #include "Generic/BootMaint/BootMaint.h"\r
 \r
 #if   defined (MDE_CPU_IA32)\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
index 9c21407d1ef0fff0d50609bc361b7a9d70ad7810..8804b141aec17204894a55f261b9ade793442a05 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
@@ -19,11 +19,6 @@ AgBStract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "BootMaint.h"\r
 \r
 EFI_STATUS\r
 #include "BootMaint.h"\r
 \r
 EFI_STATUS\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
index 9054f134d612b6730afc7e23cc31beb49868f056..51570f20b9fdffc5f00bffcd69e127f637ed0337 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/Bds.h"\r
 #include "BootMaint.h"\r
 #include "formguid.h"\r
 #include "Generic/Bds.h"\r
 #include "BootMaint.h"\r
 #include "formguid.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
index 3596be18f46ad164112c873c5aee7f349581f846..5b21fabbc040bc08c5dfef5142137ecfb99b9fcd 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
@@ -22,11 +22,7 @@ Revision History
 #ifndef _BOOT_MAINT_H\r
 #define _BOOT_MAINT_H\r
 \r
 #ifndef _BOOT_MAINT_H\r
 #define _BOOT_MAINT_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
+#include "Generic/Bds.h"\r

 #include "Generic/BootMaint/BBSsupport.h"\r
 \r
 //\r
 #include "Generic/BootMaint/BBSsupport.h"\r
 \r
 //\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
index c9d8bef4eb539c654a020164a2ddc21290063a82..b5afc7c7fea7359ae8d2bc94e7cb4802546f3c96 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
@@ -24,11 +24,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "BootMaint.h"\r
 #include "BBSsupport.h"\r
 \r
 #include "BootMaint.h"\r
 #include "BBSsupport.h"\r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c
index d30792d15b25dcb9e9e902f2d9b13e764aaf0777..7a62765fcdb9670586ecb1d23b018b4d1de66297 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "BootMaint.h"\r
 \r
 EFI_DEVICE_PATH_PROTOCOL  *\r
 #include "BootMaint.h"\r
 \r
 EFI_DEVICE_PATH_PROTOCOL  *\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c
index bab6de6722aa8129cc16547cd13c202161dbac0e..4b169c9822fafd6572d52a4678424069e6633abf 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "BootMaint.h"\r
 \r
 EFI_HII_UPDATE_DATA *UpdateData;\r
 #include "BootMaint.h"\r
 \r
 EFI_HII_UPDATE_DATA *UpdateData;\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
index 4d21995612827911a047f1c0c444cb66489cb747..db835cf534ca9d7829d6ffcdf3c8138ff9353eeb 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
@@ -19,11 +19,6 @@ AgBStract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/Bds.h"\r
 #include "BootMaint.h"\r
 #include "BdsPlatform.h"\r
 #include "Generic/Bds.h"\r
 #include "BootMaint.h"\r
 #include "BdsPlatform.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c
index c03538d0b61707dc72d64a0e1e9b5a28ae19546f..435b0753d47c72b51858e5bf52df0e4e038828e8 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c
@@ -12,11 +12,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/Bds.h"\r
 #include "BootMaint.h"\r
 #include "BdsPlatform.h"\r
 #include "Generic/Bds.h"\r
 #include "BootMaint.h"\r
 #include "BdsPlatform.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
index e1c7e58f686f98c3d3fd58c0f424bc6355f67c6e..cac68a16b061ab174477df80a0b1880ba77e4a1f 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/Bds.h"\r
 #include "BootMaint.h"\r
 #include "bdsplatform.h"\r
 #include "Generic/Bds.h"\r
 #include "BootMaint.h"\r
 #include "bdsplatform.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
index cfe4ee4d7a853e1e0a706f92375d1b3acf9eff45..14209b87d54fc62f52e8a85f29ca6dffc9944169 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c
@@ -18,10 +18,6 @@ Abstract:
   The platform boot manager reference implement\r
 \r
 --*/\r
   The platform boot manager reference implement\r
 \r
 --*/\r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r

 \r
 #include "BootManager.h"\r
 \r
 \r
 #include "BootManager.h"\r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
index 641e39dec292a52fd7eb8f8500f98c125bf86f22..fd9b5a1f34b8b3ebeec037e8f24c03df47eb9de0 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _EFI_BOOT_MANAGER_H\r
 #define _EFI_BOOT_MANAGER_H\r
 \r
 #ifndef _EFI_BOOT_MANAGER_H\r
 #define _EFI_BOOT_MANAGER_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "Generic/BdsString.h"\r
 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "Generic/BdsString.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c b/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
index 7fea4552b70df7194a5877807307c0a3d200a758..d56545266b8cbd1ec166b620dfe78330e318142e 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
@@ -19,12 +19,7 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
+#include "Bds.h"\r

 #include <Guid/FlashMapHob.h>\r
 \r
 VOID\r
 #include <Guid/FlashMapHob.h>\r
 \r
 VOID\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
index 9cfb82db11374566310701e3c6841e074337e781..f990350781814224e4824f7346cd74e7ad97a2df 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c
@@ -18,10 +18,7 @@ Abstract:
   The platform device manager reference implement\r
 \r
 --*/\r
   The platform device manager reference implement\r
 \r
 --*/\r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+\r

 #include "DeviceManager.h"\r
 \r
 STATIC UINT16                     mTokenCount;\r
 #include "DeviceManager.h"\r
 \r
 STATIC UINT16                     mTokenCount;\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
index d7238dfc53c6b3d94a843d8cee73e63ccd26ab68..dd6d935e4554338e9cb234d865c8b0231c68ab7b 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _DEVICE_MANAGER_H\r
 #define _DEVICE_MANAGER_H\r
 \r
 #ifndef _DEVICE_MANAGER_H\r
 #define _DEVICE_MANAGER_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/FrontPage.h"\r
 \r
 #define EFI_NON_DEVICE_CLASS              0x00  // Useful when you do not want something in the Device Manager\r
 #include "Generic/FrontPage.h"\r
 \r
 #define EFI_NON_DEVICE_CLASS              0x00  // Useful when you do not want something in the Device Manager\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
index 9b8a805e462d8835d430b6d7559eebf7a05b3bdc..93b27c5ed42574c533ac9844fd8cb2c2ce167b4e 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
@@ -18,12 +18,6 @@ Abstract:
   FrontPage routines to handle the callbacks and browser calls\r
 \r
 --*/\r
   FrontPage routines to handle the callbacks and browser calls\r
 \r
 --*/\r

-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "FrontPage.h"\r
 #include "Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "FrontPage.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h
index 7e17cb4314339a13c296b733acd1baa23d1241ec..0f673f09567595f8d944f07092c3b5aeaff8771b 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _FRONT_PAGE_H\r
 #define _FRONT_PAGE_H\r
 \r
 #ifndef _FRONT_PAGE_H\r
 #define _FRONT_PAGE_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/DeviceMngr/DeviceManager.h"\r
 #include "Generic/BootMaint/BootMaint.h"\r
 #include "Generic/BootMngr/BootManager.h"\r
 #include "Generic/DeviceMngr/DeviceManager.h"\r
 #include "Generic/BootMaint/BootMaint.h"\r
 #include "Generic/BootMngr/BootManager.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
index c8e73a21bc626e35e869802a406ec4993ccfa78f..53657fe4d04dca76140cfed8d79fc70968fbdb15 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
@@ -20,12 +20,7 @@ Abstract:
 Revision History\r
 \r
 --*/\r
 Revision History\r
 \r
 --*/\r

-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
+#include "Bds.h"\r

 #include "BdsString.h"\r
 #include "Language.h"\r
 \r
 #include "BdsString.h"\r
 #include "Language.h"\r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Language.h b/Nt32Pkg/PlatformBdsDxe/Generic/Language.h
index c5af97d82356f2d9ab8b4f48a3997d2fdc5544be..a32e94e4e68cf3987b857fa8f72d2791b43351a5 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Language.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Language.h
@@ -24,10 +24,6 @@ Revision History
 #ifndef _LANGUAGE_H\r
 #define _LANGUAGE_H\r
 \r
 #ifndef _LANGUAGE_H\r
 #define _LANGUAGE_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r

 \r
 #define ISO_639_2_ENTRY_SIZE  3\r
 \r
 \r
 #define ISO_639_2_ENTRY_SIZE  3\r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
index 21bfe05e030c64199c0b7eee9e71ce62dc8af130..0ed4207cd80cfce3a2299b039c2ea0291784ce5e 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "bds.h"\r
 #include "BdsPlatform.h"\r
 #include "BdsString.h"\r
 #include "bds.h"\r
 #include "BdsPlatform.h"\r
 #include "BdsString.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/String.c b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
index cbb35d027be0333bd05fed29494db476745cc8bf..f84b348d96acfdea06ba0df6c7fc279ae1520a56 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/String.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Bds.h"\r
 #include "BdsString.h"\r
 #include "Language.h"\r
 #include "Bds.h"\r
 #include "BdsString.h"\r
 #include "Language.h"\r

diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformData.c b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
index 175c569f6c785a156e94e22e25ff84d5fa3af505..e67de004b8b6b35f09720660e28e2e46820326a9 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/PlatformData.c
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r

 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
 #include <Protocol/WinNtThunk.h>\r
 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
 #include <Protocol/WinNtThunk.h>\r