Removed CommonHeader.h from MdePkg & MdeModulePkg

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

20 files changed, 21 insertions, 176 deletions

diff --git a/MdeModulePkg/Core/Pei/BootMode/BootMode.c b/MdeModulePkg/Core/Pei/BootMode/BootMode.c
index 0576ab0926..bec0304113 100644
--- a/MdeModulePkg/Core/Pei/BootMode/BootMode.c
+++ b/MdeModulePkg/Core/Pei/BootMode/BootMode.c
@@ -23,11 +23,6 @@ Revision History
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 EFI_STATUS

diff --git a/MdeModulePkg/Core/Pei/CommonHeader.h b/MdeModulePkg/Core/Pei/CommonHeader.h
deleted file mode 100644
index dc64dcad61..0000000000
--- a/MdeModulePkg/Core/Pei/CommonHeader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**@file

-  Common header file shared by all source files.

-

-  This file includes package header files, library classes and protocol, PPI & GUID definitions.

-

-  Copyright (c) 2006 - 2007, Intel Corporation

-  All rights reserved. This program and the accompanying materials

-   are licensed and made available under the terms and conditions of the BSD License

-   which accompanies this distribution. The full text of the license may be found at

-   http://opensource.org/licenses/bsd-license.php

-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-**/

-

-#ifndef __COMMON_HEADER_H_

-#define __COMMON_HEADER_H_

-

-#include <PiPei.h>

-#include <FrameworkPei.h>

-//

-// The protocols, PPI and GUID defintions for this module

-//

-#include <Ppi/DxeIpl.h>

-#include <Ppi/MemoryDiscovered.h>

-#include <Ppi/FindFv.h>

-#include <Ppi/StatusCode.h>

-#include <Ppi/Security.h>

-#include <Ppi/Reset.h>

-#include <Ppi/LoadFile.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/DebugLib.h>

-#include <Library/PeiCoreEntryPoint.h>

-#include <Library/BaseLib.h>

-#include <Library/HobLib.h>

-#include <Library/PerformanceLib.h>

-#include <Library/PeiServicesLib.h>

-#include <Library/ReportStatusCodeLib.h>

-#include <Library/PeCoffGetEntryPointLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/TimerLib.h>

-

-#endif

diff --git a/MdeModulePkg/Core/Pei/Dependency/dependency.c b/MdeModulePkg/Core/Pei/Dependency/dependency.c
index ec3c68b137..c817a3d171 100644
--- a/MdeModulePkg/Core/Pei/Dependency/dependency.c
+++ b/MdeModulePkg/Core/Pei/Dependency/dependency.c
@@ -23,11 +23,6 @@ Abstract:
   

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 #include "dependency.h"

 

diff --git a/MdeModulePkg/Core/Pei/Dependency/dependency.h b/MdeModulePkg/Core/Pei/Dependency/dependency.h
index 2ac2ddb17b..a6190c4441 100644
--- a/MdeModulePkg/Core/Pei/Dependency/dependency.h
+++ b/MdeModulePkg/Core/Pei/Dependency/dependency.h
@@ -23,10 +23,6 @@ Abstract:
 #ifndef _PEI_DEPENDENCY_H_

 #define _PEI_DEPENDENCY_H_

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

 

 #define MAX_GRAMMAR_SIZE  256

 

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 15b23604b6..7ae8347963 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -21,11 +21,6 @@ Revision History
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 STATIC

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Stack.c b/MdeModulePkg/Core/Pei/Dispatcher/Stack.c
index 8895cae4d1..9e74eee587 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Stack.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Stack.c
@@ -17,7 +17,7 @@
 //

 // Include common header file for this module.

 //

-#include "CommonHeader.h"

+#include <PeiMain.h>

 

 /**

   Transfers control to a function starting with a new stack.

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 679825cabc..d144fb85ec 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 #define GETOCCUPIEDSIZE(ActualSize, Alignment) \

diff --git a/MdeModulePkg/Core/Pei/Hob/Hob.c b/MdeModulePkg/Core/Pei/Hob/Hob.c
index 9128b12e93..9ac672b24d 100644
--- a/MdeModulePkg/Core/Pei/Hob/Hob.c
+++ b/MdeModulePkg/Core/Pei/Hob/Hob.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 EFI_STATUS

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 391290d018..202936869b 100644
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 

diff --git a/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h b/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h
index e5b160f76b..e2df07378e 100644
--- a/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h
+++ b/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h
@@ -24,11 +24,6 @@ Revision History
 #ifndef _IPF_PEI_MAIN_H_

 #define _IPF_PEI_MAIN_H_

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 SAL_RETURN_REGS

diff --git a/MdeModulePkg/Core/Pei/Ipf/Stack.c b/MdeModulePkg/Core/Pei/Ipf/Stack.c
index 600a41dafb..56a876df15 100644
--- a/MdeModulePkg/Core/Pei/Ipf/Stack.c
+++ b/MdeModulePkg/Core/Pei/Ipf/Stack.c
@@ -14,11 +14,6 @@
 

 **/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 /**

diff --git a/MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c b/MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c
index f4e90e13c3..db9cb52adf 100644
--- a/MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c
+++ b/MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c
@@ -21,11 +21,6 @@ Revision History
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "IpfPeiMain.h"

 #include "IpfCpuCore.i"

 

diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 86f4487899..e623c01099 100644
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 VOID

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index e136041698..e7d972fa83 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -24,10 +24,26 @@ Revision History
 #ifndef _PEI_MAIN_H_

 #define _PEI_MAIN_H_

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

+#include <PiPei.h>

+#include <FrameworkPei.h>

+#include <Ppi/DxeIpl.h>

+#include <Ppi/MemoryDiscovered.h>

+#include <Ppi/FindFv.h>

+#include <Ppi/StatusCode.h>

+#include <Ppi/Security.h>

+#include <Ppi/Reset.h>

+#include <Ppi/LoadFile.h>

+#include <Library/DebugLib.h>

+#include <Library/PeiCoreEntryPoint.h>

+#include <Library/BaseLib.h>

+#include <Library/HobLib.h>

+#include <Library/PerformanceLib.h>

+#include <Library/PeiServicesLib.h>

+#include <Library/ReportStatusCodeLib.h>

+#include <Library/PeCoffGetEntryPointLib.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/TimerLib.h>

+

 

 extern EFI_GUID gEfiPeiCorePrivateGuid;

 

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index c55682300c..c6e5e11f02 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -14,11 +14,6 @@
 #

 #**/

 

-################################################################################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-################################################################################

 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = PeiMain

@@ -36,12 +31,6 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-################################################################################

-#

-# Sources Section - list of files that are required for the build to succeed.

-#

-################################################################################

-

 [Sources.common]

   StatusCode/StatusCode.c

   Security/Security.c

@@ -57,7 +46,6 @@
   Dependency/dependency.h

   BootMode/BootMode.c

   PeiMain.h

-  CommonHeader.h

 

 [Sources.Ia32]

   Dispatcher/Stack.c

@@ -76,35 +64,14 @@
   Dispatcher/Stack.c

 

 

-################################################################################

-#

-# Includes Section - list of Include locations that are required for

-#                    this module.

-#

-################################################################################

-

 [Includes]

   $(WORKSPACE)/MdePkg\Include/Library

 

-################################################################################

-#

-# Package Dependency Section - list of Package files that are required for

-#                              this module.

-#

-################################################################################

-

 [Packages]

   MdeModulePkg/MdeModulePkg.dec

   MdePkg/MdePkg.dec

   IntelFrameworkPkg/IntelFrameworkPkg.dec

 

-################################################################################

-#

-# Library Class Section - list of Library Classes that are required for

-#                         this module.

-#

-################################################################################

-

 [LibraryClasses]

   TimerLib

   BaseMemoryLib

@@ -117,24 +84,9 @@
   OldPeiCoreEntryPoint

   DebugLib

 

-

-################################################################################

-#

-# Guid C Name Section - list of Guids that this module uses or produces.

-#

-################################################################################

-

 [Guids]

   gEfiPeiCorePrivateGuid                        # PRIVATE

 

-

-################################################################################

-#

-# PPI C Name Section - list of PPI and PPI Notify C Names that this module

-#                      uses or produces.

-#

-################################################################################

-

 [Ppis]

   gEfiPeiSecurityPpiGuid                        # PPI_NOTIFY SOMETIMES_CONSUMED

   gEfiPeiStatusCodePpiGuid                      # PPI SOMETIMES_CONSUMED

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index db4a69f568..5d439f74ac 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -21,11 +21,6 @@ Revision History
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 //

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index 0f119c7fb6..c8bea851a5 100644
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -21,11 +21,6 @@ Revision History
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 VOID

diff --git a/MdeModulePkg/Core/Pei/Reset/Reset.c b/MdeModulePkg/Core/Pei/Reset/Reset.c
index b0c4b24370..ef0ceb3b19 100644
--- a/MdeModulePkg/Core/Pei/Reset/Reset.c
+++ b/MdeModulePkg/Core/Pei/Reset/Reset.c
@@ -21,11 +21,6 @@ Revision History
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 EFI_STATUS

diff --git a/MdeModulePkg/Core/Pei/Security/Security.c b/MdeModulePkg/Core/Pei/Security/Security.c
index e7c2fbde95..089995e529 100644
--- a/MdeModulePkg/Core/Pei/Security/Security.c
+++ b/MdeModulePkg/Core/Pei/Security/Security.c
@@ -19,11 +19,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 STATIC

diff --git a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c b/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
index 9112c45dc9..b9316b6e9e 100644
--- a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
+++ b/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
@@ -21,11 +21,6 @@ Revision History
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <PeiMain.h>

 

 EFI_STATUS