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
2007-07-27 03:52:06 +00:00 · 2007-07-27 03:52:06 +00:00 · 40f18da12b
parent 141a0202ad
commit 40f18da12b
28 changed files with 106 additions and 205 deletions
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
@ -20,11 +20,6 @@ Abstract:

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BdsPlatform.h"
 #include "Generic/BdsString.h"
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.h
@ -22,10 +22,61 @@ Abstract:
 #ifndef _BDS_PLATFORM_H
 #define _BDS_PLATFORM_H

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

 #include "IndustryStandard/Pci22.h"

--- a/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
+++ b/Nt32Pkg/PlatformBdsDxe/CommonHeader.h
@ -1,74 +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_
-
-#include <PiDxe.h>
-#include <Common/MaxBbsEntries.h>
-#include <Protocol/FormCallbackFramework.h>
-#include <Protocol/DevicePath.h>
-#include <Protocol/LoadFile.h>
-#include <Protocol/CpuIo.h>
-#include <Protocol/Bds.h>
-#include <Protocol/DataHub.h>
-#include <Protocol/FormBrowserFramework.h>
-#include <Protocol/UgaDraw.h>
-#include <Protocol/BlockIo.h>
-#include <Protocol/ConsoleControl.h>
-#include <Protocol/GenericMemoryTest.h>
-#include <Protocol/GraphicsOutput.h>
-#include <Protocol/SimpleFileSystem.h>
-#include <Protocol/HiiFramework.h>
-#include <Protocol/SerialIo.h>
-#include <Protocol/LegacyBios.h>
-#include <Protocol/Performance.h>
-#include <Guid/PcAnsi.h>
-#include <Guid/DataHubRecords.h>
-#include <Guid/Bmp.h>
-#include <Guid/FileInfo.h>
-#include <Guid/BootState.h>
-#include <Guid/FileSystemVolumeLabelInfo.h>
-#include <Guid/GenericPlatformVariable.h>
-#include <Guid/GlobalVariable.h>
-
-#include <Library/DebugLib.h>
-#include <Library/UefiLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/BaseLib.h>
-#include <Library/GraphicsLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/PerformanceLib.h>
-#include <Library/PrintLib.h>
-#include <Library/IfrSupportLibFramework.h>
-#include <Library/ReportStatusCodeLib.h>
-#include <Library/HobLib.h>
-#include <Library/EdkGenericBdsLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/HiiLibFramework.h>
-#include <Library/PeCoffLib.h>
-#include <Library/PcdLib.h>
-
-//
-// The rest of the includes
-//
-#include <Common/FirmwareRevision.h>
-
-extern UINT8 PlatformBdsStrings[];
-
-#endif
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Bds.h
@ -24,10 +24,55 @@ Revision History
 #ifndef _BDS_H
 #define _BDS_H

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

 //
 // Bds AP Context data
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
@ -19,11 +19,6 @@ Abstract:

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Bds.h"
 #include "BdsPlatform.h"
 #include "FrontPage.h"
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BBSsupport.c
@ -21,11 +21,6 @@ Abstract:

 --*/

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

 EFI_DEVICE_PATH_PROTOCOL  EndDevicePath[] = {
--- 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
 #define _EFI_BDS_BBS_SUPPORT_H

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/BootMaint/BootMaint.h"

 #if   defined (MDE_CPU_IA32)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c
@ -19,11 +19,6 @@ AgBStract:

 --*/

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

 EFI_STATUS
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c
@ -19,11 +19,6 @@ Abstract:

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BootMaint.h"
 #include "formguid.h"
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h
@ -22,11 +22,7 @@ Revision History
 #ifndef _BOOT_MAINT_H
 #define _BOOT_MAINT_H

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

 //
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c
@ -24,11 +24,6 @@ Revision History

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "BootMaint.h"
 #include "BBSsupport.h"

--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/ConsoleOption.c
@ -21,11 +21,6 @@ Revision History

 --*/

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

 EFI_DEVICE_PATH_PROTOCOL  *
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Data.c
@ -21,11 +21,6 @@ Revision History

 --*/

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

 EFI_HII_UPDATE_DATA *UpdateData;
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c
@ -19,11 +19,6 @@ AgBStract:

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BootMaint.h"
 #include "BdsPlatform.h"
--- 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.

 **/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BootMaint.h"
 #include "BdsPlatform.h"
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c
@ -19,11 +19,6 @@ Abstract:

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BootMaint.h"
 #include "bdsplatform.h"
--- 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

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

 #include "BootManager.h"

--- 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
 #define _EFI_BOOT_MANAGER_H

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BdsPlatform.h"
 #include "Generic/BdsString.h"
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Capsules.c
@ -19,12 +19,7 @@ Abstract:

 --*/

-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
+#include "Bds.h"
 #include <Guid/FlashMapHob.h>

 VOID
--- 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

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

 STATIC UINT16                     mTokenCount;
--- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h
@ -24,11 +24,6 @@ Revision History
 #ifndef _DEVICE_MANAGER_H
 #define _DEVICE_MANAGER_H

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/FrontPage.h"

 #define EFI_NON_DEVICE_CLASS              0x00  // Useful when you do not want something in the Device Manager
--- 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

 --*/
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Bds.h"
 #include "BdsPlatform.h"
 #include "FrontPage.h"
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h
@ -24,11 +24,6 @@ Revision History
 #ifndef _FRONT_PAGE_H
 #define _FRONT_PAGE_H

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/DeviceMngr/DeviceManager.h"
 #include "Generic/BootMaint/BootMaint.h"
 #include "Generic/BootMngr/BootManager.h"
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
@ -20,12 +20,7 @@ Abstract:
 Revision History

 --*/
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
+#include "Bds.h"
 #include "BdsString.h"
 #include "Language.h"

--- a/Nt32Pkg/PlatformBdsDxe/Generic/Language.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Language.h
@ -24,10 +24,6 @@ Revision History
 #ifndef _LANGUAGE_H
 #define _LANGUAGE_H

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

 #define ISO_639_2_ENTRY_SIZE  3

--- a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
@ -19,11 +19,6 @@ Abstract:

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "bds.h"
 #include "BdsPlatform.h"
 #include "BdsString.h"
--- a/Nt32Pkg/PlatformBdsDxe/Generic/String.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
@ -21,11 +21,6 @@ Revision History

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Bds.h"
 #include "BdsString.h"
 #include "Language.h"
--- a/Nt32Pkg/PlatformBdsDxe/PlatformData.c
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
@ -20,11 +20,6 @@ Abstract:

 --*/

-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
 #include "Generic/Bds.h"
 #include "BdsPlatform.h"
 #include <Protocol/WinNtThunk.h>