From 859b72fa7e3ff1cf1d7476a3446af4ebbb5fe3e6 Mon Sep 17 00:00:00 2001 From: AJFISH Date: Tue, 10 Jul 2007 16:13:56 +0000 Subject: [PATCH] Removed CommonHeader.h from MdePkg & MdeModulePkg git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3180 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Core/DxeIplPeim/CommonHeader.h | 56 ----------------- MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 32 ++++++++-- MdeModulePkg/Core/DxeIplPeim/DxeLoad.c | 5 -- .../Core/DxeIplPeim/Ia32/DxeLoadFunc.c | 5 -- MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c | 5 -- .../Core/DxeIplPeim/Ia32/VirtualMemory.c | 7 +-- .../Core/DxeIplPeim/Ia32/VirtualMemory.h | 5 -- .../Core/DxeIplPeim/Ipf/DxeLoadFunc.c | 5 -- MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c | 5 -- .../Core/DxeIplPeim/X64/DxeLoadFunc.c | 5 -- MdeModulePkg/Core/Pei/BootMode/BootMode.c | 5 -- MdeModulePkg/Core/Pei/CommonHeader.h | 44 ------------- MdeModulePkg/Core/Pei/Dependency/dependency.c | 5 -- MdeModulePkg/Core/Pei/Dependency/dependency.h | 4 -- MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 5 -- MdeModulePkg/Core/Pei/Dispatcher/Stack.c | 2 +- MdeModulePkg/Core/Pei/FwVol/FwVol.c | 5 -- MdeModulePkg/Core/Pei/Hob/Hob.c | 5 -- MdeModulePkg/Core/Pei/Image/Image.c | 5 -- MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h | 5 -- MdeModulePkg/Core/Pei/Ipf/Stack.c | 5 -- MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c | 5 -- MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 5 -- MdeModulePkg/Core/Pei/PeiMain.h | 24 ++++++-- MdeModulePkg/Core/Pei/PeiMain.inf | 48 --------------- MdeModulePkg/Core/Pei/PeiMain/PeiMain.c | 5 -- MdeModulePkg/Core/Pei/Ppi/Ppi.c | 5 -- MdeModulePkg/Core/Pei/Reset/Reset.c | 5 -- MdeModulePkg/Core/Pei/Security/Security.c | 5 -- MdeModulePkg/Core/Pei/StatusCode/StatusCode.c | 5 -- .../Library/EdkFvbServiceLib/EntryPoint.c | 54 ---------------- .../Library/EdkFvbServiceLib/X64/Fvb.c | 5 -- .../Console/ConPlatformDxe/CommonHeader.h | 54 ---------------- .../Console/ConPlatformDxe/ComponentName.c | 3 +- .../Console/ConPlatformDxe/ComponentName.h | 45 -------------- .../Console/ConPlatformDxe/ConPlatform.c | 36 +---------- .../Console/ConPlatformDxe/ConPlatform.h | 46 +++++++++++++- .../Console/ConPlatformDxe/ConPlatform.inf | 44 ------------- .../GraphicsConsoleDxe/ComponentName.h | 33 ---------- .../Universal/DevicePathDxe/CommonHeader.h | 44 ------------- .../Universal/DevicePathDxe/DevicePath.c | 5 -- .../Universal/DevicePathDxe/DevicePath.h | 19 ++++-- .../Universal/DevicePathDxe/DevicePath.inf | 50 --------------- .../DevicePathDxe/DevicePathFromText.c | 5 -- .../DevicePathDxe/DevicePathToText.c | 5 -- .../DevicePathDxe/DevicePathUtilities.c | 5 -- MdeModulePkg/Universal/PCD/Dxe/CommonHeader.h | 41 ------------- MdeModulePkg/Universal/PCD/Dxe/Pcd.c | 5 -- MdeModulePkg/Universal/PCD/Dxe/Pcd.inf | 59 ------------------ MdeModulePkg/Universal/PCD/Dxe/Service.c | 4 -- MdeModulePkg/Universal/PCD/Dxe/Service.h | 16 +++-- MdeModulePkg/Universal/PCD/Pei/CommonHeader.h | 20 ------ MdeModulePkg/Universal/PCD/Pei/Pcd.inf | 1 - .../VariableRuntimeDxe/CommonHeader.h | 48 --------------- .../VariableRuntimeDxe/InitVariable.c | 5 -- .../Universal/VariableRuntimeDxe/Variable.c | 2 - .../Universal/VariableRuntimeDxe/Variable.h | 61 ++++++++++++------- .../Universal/VariableRuntimeDxe/Variable.inf | 51 ---------------- .../Universal/VariableRuntimeDxe/reclaim.c | 2 +- .../Universal/VariableRuntimeDxe/reclaim.h | 50 --------------- .../BaseCustomDecompressLibNull.c | 7 +-- .../BaseCustomDecompressLibNull.inf | 20 ------ .../CommonHeader.h | 28 --------- .../DxeDebugLibSerialPort/CommonHeader.h | 33 ---------- .../Library/DxeDebugLibSerialPort/DebugLib.c | 12 ++-- .../DxeDebugLibSerialPort.inf | 43 ------------- MdePkg/Library/UefiUsbLib/CommonHeader.h | 29 --------- MdePkg/Library/UefiUsbLib/UsbDxeLib.c | 5 +- MdePkg/Library/UefiUsbLib/hid.c | 5 +- 69 files changed, 178 insertions(+), 1149 deletions(-) delete mode 100644 MdeModulePkg/Core/DxeIplPeim/CommonHeader.h delete mode 100644 MdeModulePkg/Core/Pei/CommonHeader.h delete mode 100644 MdeModulePkg/Library/EdkFvbServiceLib/EntryPoint.c delete mode 100644 MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h delete mode 100644 MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h delete mode 100644 MdeModulePkg/Universal/DevicePathDxe/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/PCD/Dxe/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/PCD/Pei/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/VariableRuntimeDxe/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h delete mode 100644 MdePkg/Library/BaseCustomDecompressLibNull/CommonHeader.h delete mode 100644 MdePkg/Library/DxeDebugLibSerialPort/CommonHeader.h delete mode 100644 MdePkg/Library/UefiUsbLib/CommonHeader.h diff --git a/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h b/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h deleted file mode 100644 index 2240f6ddeb..0000000000 --- a/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h +++ /dev/null @@ -1,56 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h index 5315b8b9dc..ae8b90be8f 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h @@ -20,10 +20,34 @@ Abstract: #ifndef __PEI_DXEIPL_H__ #define __PEI_DXEIPL_H__ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #define STACK_SIZE 0x20000 #define BSP_STORE_SIZE 0x4000 diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c index eec1d864da..ebae17ccd2 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c +++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DxeIpl.h" // porting note remove later diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c index d3fbcb2e08..63ee2af396 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c +++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c @@ -19,11 +19,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DxeIpl.h" #include "VirtualMemory.h" diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c index f7bef7eb3e..b4bd64067c 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c +++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c @@ -17,11 +17,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DxeIpl.h" EFI_STATUS diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c index f4a6a4faba..92f29daf8b 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c +++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c @@ -32,13 +32,10 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - +#include "DxeIpl.h" #include "VirtualMemory.h" + UINTN CreateIdentityMappingPageTables ( VOID diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h index 4e6614ecfb..89a7f2eceb 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h +++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h @@ -26,11 +26,6 @@ Abstract: #define _VIRTUAL_MEMORY_H_ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #define SYS_CODE64_SEL 0x38 #pragma pack(1) diff --git a/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c index 3feb2e5ee5..34141ab9f6 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c +++ b/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c @@ -19,11 +19,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DxeIpl.h" VOID diff --git a/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c b/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c index 5002fe8c67..b04c9a7e1b 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c +++ b/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c @@ -17,11 +17,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DxeIpl.h" EFI_STATUS diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c index 1d5709af5e..53febd563d 100644 --- a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c +++ b/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c @@ -19,11 +19,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DxeIpl.h" VOID 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 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 -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#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 #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 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 /** 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 #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 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 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 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 /** 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 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + 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 // 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 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 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 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 EFI_STATUS diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/EntryPoint.c b/MdeModulePkg/Library/EdkFvbServiceLib/EntryPoint.c deleted file mode 100644 index 9cdf594c78..0000000000 --- a/MdeModulePkg/Library/EdkFvbServiceLib/EntryPoint.c +++ /dev/null @@ -1,54 +0,0 @@ -/**@file - Entry Point Source file. - - This file contains the user entry point - - 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. -**/ - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - -// -// Event for Exit Boot Services Callback -// -STATIC EFI_EVENT mExitBootServicesEvent = NULL; - -/** - The user Entry Point for module EdkFvbServiceLib. The user code starts with this function. - - @param[in] ImageHandle The firmware allocated handle for the EFI image. - @param[in] SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The entry point is executed successfully. - @retval other Some error occurs when executing this entry point. - -**/ -EFI_STATUS -EFIAPI -InitializeEdkFvbServiceLib( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - - Status = gBS->CreateEvent ( - EVT_SIGNAL_EXIT_BOOT_SERVICES, - TPL_NOTIFY, - FvbVirtualAddressChangeNotifyEvent, - NULL, - &mExitBootServicesEvent - ); - ASSERT_EFI_ERROR (Status); - - return Status; -} diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c index 4ffc15c385..7bc89a0c87 100644 --- a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c +++ b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c @@ -20,11 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Fvb.h" // diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h deleted file mode 100644 index 5a5ef994d2..0000000000 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h +++ /dev/null @@ -1,54 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include - -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// Driver Binding Externs -// -extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; -extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; - -#endif diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c index 146eee62c6..e11dcf3372 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c @@ -22,8 +22,7 @@ Abstract: // -#include "ConPlatform.h" -#include "ComponentName.h" +#include // // EFI Component Name Protocol diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h deleted file mode 100644 index 17c43481b6..0000000000 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h +++ /dev/null @@ -1,45 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - ComponentName.h - -Abstract: - ---*/ - -#ifndef CON_MANAGE_COMPONENT_NAME_H_ -#define CON_MANAGE_COMPONENT_NAME_H_ - - -// -// EFI Component Name Functions -// -EFI_STATUS -EFIAPI -ConPlatformComponentNameGetDriverName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN CHAR8 *Language, - OUT CHAR16 **DriverName - ); - -EFI_STATUS -EFIAPI -ConPlatformComponentNameGetControllerName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE ChildHandle OPTIONAL, - IN CHAR8 *Language, - OUT CHAR16 **ControllerName - ); - -#endif diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c index d86ea4766f..178be23ca5 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c @@ -17,40 +17,8 @@ Abstract: --*/ -#include - -#include "ConPlatform.h" - - -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// Driver Binding Externs -// -extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; -extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; +#include + EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding = { ConPlatformTextInDriverBindingSupported, diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h index a1035156e5..f408ede7a4 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h @@ -20,10 +20,31 @@ Abstract: #ifndef CON_MANAGE_H_ #define CON_MANAGE_H_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + // -// Include common header file for this module. +// Driver Binding Externs // -#include "CommonHeader.h" +extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; +extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; #define VarConsoleInpDev L"ConInDev" #define VarConsoleInp L"ConIn" @@ -129,4 +150,25 @@ IsHotPlugDevice ( EFI_HANDLE ControllerHandle ); +// +// EFI Component Name Functions +// +EFI_STATUS +EFIAPI +ConPlatformComponentNameGetDriverName ( + IN EFI_COMPONENT_NAME_PROTOCOL *This, + IN CHAR8 *Language, + OUT CHAR16 **DriverName + ); + +EFI_STATUS +EFIAPI +ConPlatformComponentNameGetControllerName ( + IN EFI_COMPONENT_NAME_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE ChildHandle OPTIONAL, + IN CHAR8 *Language, + OUT CHAR16 **ControllerName + ); + #endif diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf index ede86983e9..f8b1d06b10 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = ConPlatform @@ -41,38 +36,14 @@ # COMPONENT_NAME = gConPlatformComponentName # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] ComponentName.c - ComponentName.h ConPlatform.h ConPlatform.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] MemoryAllocationLib DevicePathLib @@ -83,24 +54,9 @@ UefiDriverEntryPoint DebugLib - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - [Guids] gEfiGlobalVariableGuid # SOMETIMES_CONSUMED L"ErrOut" - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiHotPlugDeviceGuid # PROTOCOL TO_START gEfiDevicePathProtocolGuid # PROTOCOL TO_START diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h deleted file mode 100644 index b00a6af9fe..0000000000 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h +++ /dev/null @@ -1,33 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - ComponentName.h - -Abstract: - - -Revision History - ---*/ - -#ifndef _GRAPHICS_CONSOLE_COMPONENT_NAME_H -#define _GRAPHICS_CONSOLE_COMPONENT_NAME_H - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - -#error - -#endif diff --git a/MdeModulePkg/Universal/DevicePathDxe/CommonHeader.h b/MdeModulePkg/Universal/DevicePathDxe/CommonHeader.h deleted file mode 100644 index 24b9be38b4..0000000000 --- a/MdeModulePkg/Universal/DevicePathDxe/CommonHeader.h +++ /dev/null @@ -1,44 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c index fc92fc986f..8aff74d64e 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c @@ -20,11 +20,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DevicePath.h" EFI_HANDLE mDevicePathHandle = NULL; diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h index 9473b89e37..f95b13f7a8 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h @@ -21,10 +21,21 @@ Abstract: #ifndef _DEVICE_PATH_DRIVER_H #define _DEVICE_PATH_DRIVER_H -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include extern const EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid; extern const EFI_GUID mEfiDevicePathMessagingSASGuid; diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf index 98c3f1a60c..8258846190 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf @@ -15,11 +15,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = DevicePath @@ -37,40 +32,17 @@ # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] DevicePathUtilities.c DevicePathToText.c DevicePathFromText.c DevicePath.h DevicePath.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] PcdLib DevicePathLib @@ -82,40 +54,18 @@ PrintLib DebugLib - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - [Guids] gEfiVTUTF8Guid # ALWAYS_CONSUMED gEfiVT100Guid # ALWAYS_CONSUMED gEfiVT100PlusGuid # ALWAYS_CONSUMED gEfiPcAnsiGuid # ALWAYS_CONSUMED - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiDevicePathToTextProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiDevicePathFromTextProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiDevicePathUtilitiesProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiDebugPortProtocolGuid # PROTOCOL ALWAYS_CONSUMED - -################################################################################ -# -# Pcd FEATURE_FLAG - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsFeatureFlag.common] PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c index 18bb291a94..94a4a2b5b7 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c @@ -19,11 +19,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DevicePath.h" STATIC diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c index c024ccfba1..f1365baa26 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c @@ -19,11 +19,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DevicePath.h" STATIC diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c index a78a24d9f5..548a5349a8 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c @@ -19,11 +19,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "DevicePath.h" UINTN diff --git a/MdeModulePkg/Universal/PCD/Dxe/CommonHeader.h b/MdeModulePkg/Universal/PCD/Dxe/CommonHeader.h deleted file mode 100644 index f01b863ce0..0000000000 --- a/MdeModulePkg/Universal/PCD/Dxe/CommonHeader.h +++ /dev/null @@ -1,41 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c index 861de0fa84..01a26bb0bf 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c @@ -15,11 +15,6 @@ Module Name: Pcd.c **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Service.h" EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_CALLBACK); diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf index db828ac8d7..0da870ccde 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PcdDxe @@ -47,27 +42,9 @@ Pcd.c Service.c Service.h - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ [LibraryClasses] UefiRuntimeServicesTableLib @@ -81,54 +58,18 @@ BaseLib PcdLib -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - [Guids] gPcdDataBaseHobGuid # ALWAYS_CONSUMED Hob: GUID_EXTENSION - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gPcdProtocolGuid # PROTOCOL ALWAYS_PRODUCED - -################################################################################ -# -# Pcd FEATURE_FLAG - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsFeatureFlag.common] PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid - -################################################################################ -# -# Pcd FIXED_AT_BUILD - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsFixedAtBuild.common] PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid - -################################################################################ -# -# Dependency Expression Section - list of Dependency expressions that are required for -# this module. -# -################################################################################ - [Depex] TRUE diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c index 96a40291af..4403e6ea52 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Service.c +++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c @@ -14,10 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: Service.c **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" #include "Service.h" diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h index ff2ae79e5b..7ff2b99724 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Service.h +++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h @@ -18,10 +18,18 @@ Module Name: Service.h #ifndef _SERVICE_H #define _SERVICE_H -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // // Please make sure the PCD Serivce PEIM Version is consistent with diff --git a/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h b/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h deleted file mode 100644 index 967f160688..0000000000 --- a/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h +++ /dev/null @@ -1,20 +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_ - -#error - -#endif diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf index 450aa857f0..a9022b951b 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf @@ -36,7 +36,6 @@ Service.c Service.h Pcd.c - CommonHeader.h [Packages] MdePkg/MdePkg.dec diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/CommonHeader.h b/MdeModulePkg/Universal/VariableRuntimeDxe/CommonHeader.h deleted file mode 100644 index 7148577aab..0000000000 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/CommonHeader.h +++ /dev/null @@ -1,48 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include - - -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#endif diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c index 15e84e8b23..59403e91e7 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c @@ -19,11 +19,6 @@ Revision History --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Variable.h" // diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c index 4322961630..784a1987a8 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c @@ -21,8 +21,6 @@ Revision History #include "Variable.h" -#include "reclaim.h" - #include // diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h index aff0b8265b..904a681c33 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h @@ -20,14 +20,25 @@ Abstract: #ifndef _VARIABLE_H #define _VARIABLE_H -// -// Include common header file for this module. -// -#include "CommonHeader.h" - -// -// Statements that include other header files -// +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // // BugBug: We need relcate the head file. @@ -85,24 +96,21 @@ EFIAPI VariableCommonInitialize ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable - ) -; + ); EFI_STATUS EFIAPI VariableServiceInitialize ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable - ) -; + ); VOID EFIAPI VariableClassAddressChangeEvent ( IN EFI_EVENT Event, IN VOID *Context - ) -; + ); EFI_STATUS EFIAPI @@ -114,8 +122,7 @@ GetVariable ( OUT VOID *Data, IN VARIABLE_GLOBAL * Global, IN UINT32 Instance - ) -; + ); EFI_STATUS EFIAPI @@ -125,8 +132,7 @@ GetNextVariableName ( IN OUT EFI_GUID *VendorGuid, IN VARIABLE_GLOBAL *Global, IN UINT32 Instance - ) -; + ); EFI_STATUS EFIAPI @@ -140,8 +146,7 @@ SetVariable ( IN UINTN *VolatileOffset, IN UINTN *NonVolatileOffset, IN UINT32 Instance - ) -; + ); EFI_STATUS EFIAPI @@ -152,7 +157,19 @@ QueryVariableInfo ( OUT UINT64 *MaximumVariableSize, IN VARIABLE_GLOBAL *Global, IN UINT32 Instance - ) -; + ); + +EFI_STATUS +GetFvbHandleByAddress ( + IN EFI_PHYSICAL_ADDRESS VariableStoreBase, + OUT EFI_HANDLE *FvbHandle + ); + +EFI_STATUS +FtwVariableSpace ( + IN EFI_PHYSICAL_ADDRESS VariableBaseAddress, + IN UINT8 *Buffer, + IN UINTN BufferSize + ); #endif diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf index 5765c26f21..c2c5878740 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Variable @@ -38,38 +33,15 @@ # VIRTUAL_ADDRESS_MAP_CALLBACK = VariableClassAddressChangeEvent # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] InitVariable.c reclaim.c - reclaim.h Variable.c Variable.h - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] MemoryAllocationLib BaseLib @@ -87,39 +59,16 @@ [Guids] gEfiFlashMapHobGuid -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL SOMETIMES_CONSUMED gEfiFaultTolerantWriteLiteProtocolGuid # PROTOCOL SOMETIMES_CONSUMED gEfiVariableWriteArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiVariableArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED - -################################################################################ -# -# Pcd DYNAMIC - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsDynamic.common] PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid - -################################################################################ -# -# Dependency Expression Section - list of Dependency expressions that are required for -# this module. -# -################################################################################ - [Depex] gEfiFirmwareVolumeBlockProtocolGuid AND gEfiAlternateFvBlockGuid AND gEfiFaultTolerantWriteLiteProtocolGuid - diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c index 3ee37367d5..0adaa8787c 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c @@ -23,7 +23,7 @@ Revision History --*/ -#include "reclaim.h" +#include #include "Common/Variable.h" EFI_STATUS diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h deleted file mode 100644 index 393b5901f8..0000000000 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h +++ /dev/null @@ -1,50 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - reclaim.h - -Abstract: - - Definitions for non-volatile variable store garbage collection - -Revision History - ---*/ - -#ifndef _VAR_RECLAIM_H -#define _VAR_RECLAIM_H - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - -// -// Functions -// -EFI_STATUS -GetFvbHandleByAddress ( - IN EFI_PHYSICAL_ADDRESS VariableStoreBase, - OUT EFI_HANDLE *FvbHandle - ) -; - -EFI_STATUS -FtwVariableSpace ( - IN EFI_PHYSICAL_ADDRESS VariableBaseAddress, - IN UINT8 *Buffer, - IN UINTN BufferSize - ) -; - -#endif diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c index 877ebc97e6..96c538b15a 100644 --- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c +++ b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c @@ -19,10 +19,9 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include + RETURN_STATUS EFIAPI diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf index df8d92e766..f7b16b1c04 100644 --- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf +++ b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = BaseCustomDecompressLibNull @@ -36,23 +31,8 @@ # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] BaseCustomDecompressLibNull.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/CommonHeader.h b/MdePkg/Library/BaseCustomDecompressLibNull/CommonHeader.h deleted file mode 100644 index eedb273912..0000000000 --- a/MdePkg/Library/BaseCustomDecompressLibNull/CommonHeader.h +++ /dev/null @@ -1,28 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation. - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The Library classes this module consumes -// -#include - -#endif diff --git a/MdePkg/Library/DxeDebugLibSerialPort/CommonHeader.h b/MdePkg/Library/DxeDebugLibSerialPort/CommonHeader.h deleted file mode 100644 index 88e494fda5..0000000000 --- a/MdePkg/Library/DxeDebugLibSerialPort/CommonHeader.h +++ /dev/null @@ -1,33 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation. - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include - -#endif diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c b/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c index 0f3c390965..4fc33ee402 100644 --- a/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c +++ b/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c @@ -12,10 +12,14 @@ **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include +#include +#include +#include +#include +#include +#include + // // Define the maximum debug and assert message length that this library supports diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf index b1aeff14f0..37741d6762 100644 --- a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf +++ b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = DxeDebugLibSerialPort @@ -29,42 +24,18 @@ EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 - # # The following information is for reference only and not required by the build tools. # # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] DebugLib.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] SerialPortLib BaseMemoryLib @@ -72,24 +43,10 @@ PrintLib BaseLib - -################################################################################ -# -# Pcd FIXED_AT_BUILD - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsFixedAtBuild.common] PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid - -################################################################################ -# -# Pcd DYNAMIC - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsDynamic.common] PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid diff --git a/MdePkg/Library/UefiUsbLib/CommonHeader.h b/MdePkg/Library/UefiUsbLib/CommonHeader.h deleted file mode 100644 index 83a6a4301f..0000000000 --- a/MdePkg/Library/UefiUsbLib/CommonHeader.h +++ /dev/null @@ -1,29 +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, Intel Corporation. - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The Library classes this module consumes -// -#include -#include - -#endif diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c index 6686291aa2..626fa22290 100644 --- a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c +++ b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c @@ -21,10 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include "UefiUsbLibInternal.h" // // Get Device Descriptor diff --git a/MdePkg/Library/UefiUsbLib/hid.c b/MdePkg/Library/UefiUsbLib/hid.c index a98fbfb9a1..a1019a0f2d 100644 --- a/MdePkg/Library/UefiUsbLib/hid.c +++ b/MdePkg/Library/UefiUsbLib/hid.c @@ -21,10 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" +#include "UefiUsbLibInternal.h" // // Function to get HID descriptor -- 2.39.2