Removed CommonHeader.h from MdePkg & MdeModulePkg

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

diff --git a/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h b/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h
deleted file mode 100644 (file)
index 2240f6d..0000000
--- a/MdeModulePkg/Core/DxeIplPeim/CommonHeader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiPei.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Ppi/DxeIpl.h>\r
-#include <Ppi/S3Resume.h>\r
-#include <Protocol/EdkDecompress.h>\r
-#include <Ppi/EndOfPeiPhase.h>\r
-#include <Protocol/CustomizedDecompress.h>\r
-#include <Protocol/Decompress.h>\r
-#include <Ppi/Security.h>\r
-#include <Ppi/SectionExtraction.h>\r
-#include <Ppi/LoadFile.h>\r
-#include <Ppi/RecoveryModule.h>\r
-#include <Ppi/MemoryDiscovered.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/PeimEntryPoint.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/HobLib.h>\r
-#include <Library/PeiServicesLib.h>\r
-#include <Library/ReportStatusCodeLib.h>\r
-#include <Library/CacheMaintenanceLib.h>\r
-#include <Library/PeCoffLoaderLib.h>\r
-#include <Library/UefiDecompressLib.h>\r
-#include <Library/CustomDecompressLib.h>\r
-#include <Library/PeiServicesTablePointerLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/PeCoffLib.h>\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 5315b8b9dce89b8f01b3ef833cbfe668dea4eceb..ae8b90be8fcd9eb642c19c4794b3e4fdf1dac07e 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -20,10 +20,34 @@ Abstract:
 #ifndef __PEI_DXEIPL_H__\r
 #define __PEI_DXEIPL_H__\r
 \r
 #ifndef __PEI_DXEIPL_H__\r
 #define __PEI_DXEIPL_H__\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiPei.h>\r
+#include <Ppi/DxeIpl.h>\r
+#include <Ppi/S3Resume.h>\r
+#include <Protocol/EdkDecompress.h>\r
+#include <Ppi/EndOfPeiPhase.h>\r
+#include <Protocol/CustomizedDecompress.h>\r
+#include <Protocol/Decompress.h>\r
+#include <Ppi/Security.h>\r
+#include <Ppi/SectionExtraction.h>\r
+#include <Ppi/LoadFile.h>\r
+#include <Ppi/RecoveryModule.h>\r
+#include <Ppi/MemoryDiscovered.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PeimEntryPoint.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/PeiServicesLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/CacheMaintenanceLib.h>\r
+#include <Library/PeCoffLoaderLib.h>\r
+#include <Library/UefiDecompressLib.h>\r
+#include <Library/CustomDecompressLib.h>\r
+#include <Library/PeiServicesTablePointerLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/PeCoffLib.h>\r
+\r

 \r
 #define STACK_SIZE      0x20000\r
 #define BSP_STORE_SIZE  0x4000\r
 \r
 #define STACK_SIZE      0x20000\r
 #define BSP_STORE_SIZE  0x4000\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index eec1d864daffce769daaf1e2bd9ad172db9b8a7e..ebae17ccd245447698adfc6b2e5f9cd2cd71aed3 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "DxeIpl.h"\r
 \r
 // porting note remove later\r
 #include "DxeIpl.h"\r
 \r
 // porting note remove later\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
index d3fbcb2e08e9d2d55844ab63ff825168a76c73f6..63ee2af39664e9f851153c40b2a1b9f5f9418c18 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "DxeIpl.h"\r
 #include "VirtualMemory.h"\r
 \r
 #include "DxeIpl.h"\r
 #include "VirtualMemory.h"\r
 \r

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
index f7bef7eb3e20245cef9ed938d222a52dccd64b34..b4bd64067c0635fa7dd1de44985c124755c4edae 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/ImageRead.c
@@ -17,11 +17,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

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

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c
index f4a6a4faba4d1339083b6cb673b7137144094ab4..92f29daf8bc32c033863dccde22fcb5e6828d577 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.c
@@ -32,13 +32,10 @@ Abstract:
   \r
 --*/  \r
 \r
   \r
 --*/  \r
 \r

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

 #include "VirtualMemory.h"\r
 \r
 #include "VirtualMemory.h"\r
 \r

+\r

 UINTN\r
 CreateIdentityMappingPageTables (\r
   VOID\r
 UINTN\r
 CreateIdentityMappingPageTables (\r
   VOID\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h
index 4e6614ecfbd1ef0a06f60dd7c5a0a13d6b8e412c..89a7f2eceb98db96e5ef8945938b1c52b5e280ee 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/VirtualMemory.h
@@ -26,11 +26,6 @@ Abstract:
 #define _VIRTUAL_MEMORY_H_\r
 \r
 \r
 #define _VIRTUAL_MEMORY_H_\r
 \r
 \r

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

 #define SYS_CODE64_SEL 0x38\r
 \r
 #pragma pack(1)\r
 #define SYS_CODE64_SEL 0x38\r
 \r
 #pragma pack(1)\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
index 3feb2e5ee577ce88e3e2be05879b7355c70672c2..34141ab9f6c887a364ddd971f037f6025abd8739 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ipf/DxeLoadFunc.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "DxeIpl.h"\r
 \r
 VOID\r
 #include "DxeIpl.h"\r
 \r
 VOID\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c b/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c
index 5002fe8c678bd4e384334271da24f7447458fd45..b04c9a7e1be6dfa15eaf1d562c7bfb54a7f47823 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ipf/ImageRead.c
@@ -17,11 +17,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

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

diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
index 1d5709af5e43a7cb953eb958bd72ec9b58ec0892..53febd563d5f614bddf5e3bcdd5ac139802d1cdd 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/X64/DxeLoadFunc.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "DxeIpl.h"\r
 \r
 VOID\r
 #include "DxeIpl.h"\r
 \r
 VOID\r

diff --git a/MdeModulePkg/Core/Pei/BootMode/BootMode.c b/MdeModulePkg/Core/Pei/BootMode/BootMode.c
index 0576ab09266f9007cd662886a0f427d4927a8ba1..bec03041131359642641107f4d2dd26a476810fb 100644 (file)
--- a/MdeModulePkg/Core/Pei/BootMode/BootMode.c
+++ b/MdeModulePkg/Core/Pei/BootMode/BootMode.c
@@ -23,11 +23,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 EFI_STATUS\r
 #include <PeiMain.h>\r
 \r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Core/Pei/CommonHeader.h b/MdeModulePkg/Core/Pei/CommonHeader.h
deleted file mode 100644 (file)
index dc64dca..0000000
--- a/MdeModulePkg/Core/Pei/CommonHeader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-#include <PiPei.h>\r
-#include <FrameworkPei.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Ppi/DxeIpl.h>\r
-#include <Ppi/MemoryDiscovered.h>\r
-#include <Ppi/FindFv.h>\r
-#include <Ppi/StatusCode.h>\r
-#include <Ppi/Security.h>\r
-#include <Ppi/Reset.h>\r
-#include <Ppi/LoadFile.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/PeiCoreEntryPoint.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/HobLib.h>\r
-#include <Library/PerformanceLib.h>\r
-#include <Library/PeiServicesLib.h>\r
-#include <Library/ReportStatusCodeLib.h>\r
-#include <Library/PeCoffGetEntryPointLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/TimerLib.h>\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Core/Pei/Dependency/dependency.c b/MdeModulePkg/Core/Pei/Dependency/dependency.c
index ec3c68b13700e9cca17663a4a3f115983fa86d03..c817a3d1717ad722aa145496f44dffc565c860b1 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dependency/dependency.c
+++ b/MdeModulePkg/Core/Pei/Dependency/dependency.c
@@ -23,11 +23,6 @@ Abstract:
   \r
 --*/\r
 \r
   \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 #include "dependency.h"\r
 \r
 #include <PeiMain.h>\r
 #include "dependency.h"\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Dependency/dependency.h b/MdeModulePkg/Core/Pei/Dependency/dependency.h
index 2ac2ddb17ba276ffce8b7eef7ae5a4b367276a19..a6190c4441d461190bc9982b0a075886a9d3828a 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dependency/dependency.h
+++ b/MdeModulePkg/Core/Pei/Dependency/dependency.h
@@ -23,10 +23,6 @@ Abstract:
 #ifndef _PEI_DEPENDENCY_H_\r
 #define _PEI_DEPENDENCY_H_\r
 \r
 #ifndef _PEI_DEPENDENCY_H_\r
 #define _PEI_DEPENDENCY_H_\r
 \r

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

 \r
 #define MAX_GRAMMAR_SIZE  256\r
 \r
 \r
 #define MAX_GRAMMAR_SIZE  256\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 15b23604b6f1dbaf314a4856b61014ae001e1c4f..7ae83479631d8f760cae54ddf95b5a301ee6b6cf 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 STATIC\r
 #include <PeiMain.h>\r
 \r
 STATIC\r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Stack.c b/MdeModulePkg/Core/Pei/Dispatcher/Stack.c
index 8895cae4d18295abc1f472806f99234203ec4ec7..9e74eee5872983b94f9d0de453ccefc9fb00c6a6 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Stack.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Stack.c
@@ -17,7 +17,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
 //\r
 // Include common header file for this module.\r
 //\r

-#include "CommonHeader.h"\r
+#include <PeiMain.h>\r

 \r
 /**\r
   Transfers control to a function starting with a new stack.\r
 \r
 /**\r
   Transfers control to a function starting with a new stack.\r

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 679825cabc13c01b8f706dadff6e6218a5c46383..d144fb85ec68df2e76d42b98c9826f9affd39499 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 #define GETOCCUPIEDSIZE(ActualSize, Alignment) \\r
 #include <PeiMain.h>\r
 \r
 #define GETOCCUPIEDSIZE(ActualSize, Alignment) \\r

diff --git a/MdeModulePkg/Core/Pei/Hob/Hob.c b/MdeModulePkg/Core/Pei/Hob/Hob.c
index 9128b12e93c56e31658cf133eb37fd2b42561d36..9ac672b24d7a1df21bc3213904dd88299b457758 100644 (file)
--- a/MdeModulePkg/Core/Pei/Hob/Hob.c
+++ b/MdeModulePkg/Core/Pei/Hob/Hob.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 EFI_STATUS\r
 #include <PeiMain.h>\r
 \r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index 391290d018e4f54368884185e28bf90f2cb88c13..202936869b62eb4b2f9417f4b5dc6562d76f934c 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 \r
 #include <PeiMain.h>\r
 \r
 \r

diff --git a/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h b/MdeModulePkg/Core/Pei/Ipf/IpfPeiMain.h
index e5b160f76b56b33a908da0c1b8b47b399ab53177..e2df07378e511fc9327690b4c6c86161d1a262f6 100644 (file)
--- 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_\r
 #define _IPF_PEI_MAIN_H_\r
 \r
 #ifndef _IPF_PEI_MAIN_H_\r
 #define _IPF_PEI_MAIN_H_\r
 \r

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

 #include <PeiMain.h>\r
 \r
 SAL_RETURN_REGS\r
 #include <PeiMain.h>\r
 \r
 SAL_RETURN_REGS\r

diff --git a/MdeModulePkg/Core/Pei/Ipf/Stack.c b/MdeModulePkg/Core/Pei/Ipf/Stack.c
index 600a41dafb8aea978e8ed7d28ec669df43cdc0b6..56a876df152b64c676d95a1cb7f5e3378e087817 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ipf/Stack.c
+++ b/MdeModulePkg/Core/Pei/Ipf/Stack.c
@@ -14,11 +14,6 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 /**\r
 #include <PeiMain.h>\r
 \r
 /**\r

diff --git a/MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c b/MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c
index f4e90e13c36131352350a1d7332d059c9e66a85e..db9cb52adf17fb1e70c0878b8d3ac6607883f1c9 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c
+++ b/MdeModulePkg/Core/Pei/Ipf/SwitchToCacheMode.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "IpfPeiMain.h"\r
 #include "IpfCpuCore.i"\r
 \r
 #include "IpfPeiMain.h"\r
 #include "IpfCpuCore.i"\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 86f448789990aab50d3ec842181bb5f040a6073b..e623c0109924d0e66308c17c0e6df8444d43f86f 100644 (file)
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 VOID\r
 #include <PeiMain.h>\r
 \r
 VOID\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index e13604169887cb8a0bf849e80f5572c4bb577750..e7d972fa83c7f5d727d4a94e0109723423cd7340 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -24,10 +24,26 @@ Revision History
 #ifndef _PEI_MAIN_H_\r
 #define _PEI_MAIN_H_\r
 \r
 #ifndef _PEI_MAIN_H_\r
 #define _PEI_MAIN_H_\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiPei.h>\r
+#include <FrameworkPei.h>\r
+#include <Ppi/DxeIpl.h>\r
+#include <Ppi/MemoryDiscovered.h>\r
+#include <Ppi/FindFv.h>\r
+#include <Ppi/StatusCode.h>\r
+#include <Ppi/Security.h>\r
+#include <Ppi/Reset.h>\r
+#include <Ppi/LoadFile.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PeiCoreEntryPoint.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/PerformanceLib.h>\r
+#include <Library/PeiServicesLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/PeCoffGetEntryPointLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/TimerLib.h>\r
+\r

 \r
 extern EFI_GUID gEfiPeiCorePrivateGuid;\r
 \r
 \r
 extern EFI_GUID gEfiPeiCorePrivateGuid;\r
 \r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index c55682300c0c7315b74e60874dcad0f94f7ed661..c6e5e11f02dd2eb8bb8e92839602570df896bd19 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
 #\r
 #**/\r
 \r

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

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PeiMain\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PeiMain\r


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

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

 [Sources.common]\r
   StatusCode/StatusCode.c\r
   Security/Security.c\r
 [Sources.common]\r
   StatusCode/StatusCode.c\r
   Security/Security.c\r


@@ -57,7 +46,6 @@
   Dependency/dependency.h\r
   BootMode/BootMode.c\r
   PeiMain.h\r
   Dependency/dependency.h\r
   BootMode/BootMode.c\r
   PeiMain.h\r

-  CommonHeader.h\r

 \r
 [Sources.Ia32]\r
   Dispatcher/Stack.c\r
 \r
 [Sources.Ia32]\r
   Dispatcher/Stack.c\r


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

-################################################################################\r
-#\r
-# Includes Section - list of Include locations that are required for\r
-#                    this module.\r
-#\r
-################################################################################\r
-\r

 [Includes]\r
   $(WORKSPACE)/MdePkg\Include/Library\r
 \r
 [Includes]\r
   $(WORKSPACE)/MdePkg\Include/Library\r
 \r

-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r

 [Packages]\r
   MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
 \r
 [Packages]\r
   MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
 \r

-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r

 [LibraryClasses]\r
   TimerLib\r
   BaseMemoryLib\r
 [LibraryClasses]\r
   TimerLib\r
   BaseMemoryLib\r


@@ -117,24 +84,9 @@
   OldPeiCoreEntryPoint\r
   DebugLib\r
 \r
   OldPeiCoreEntryPoint\r
   DebugLib\r
 \r

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

 [Guids]\r
   gEfiPeiCorePrivateGuid                        # PRIVATE\r
 \r
 [Guids]\r
   gEfiPeiCorePrivateGuid                        # PRIVATE\r
 \r

-\r
-################################################################################\r
-#\r
-# PPI C Name Section - list of PPI and PPI Notify C Names that this module\r
-#                      uses or produces.\r
-#\r
-################################################################################\r
-\r

 [Ppis]\r
   gEfiPeiSecurityPpiGuid                        # PPI_NOTIFY SOMETIMES_CONSUMED\r
   gEfiPeiStatusCodePpiGuid                      # PPI SOMETIMES_CONSUMED\r
 [Ppis]\r
   gEfiPeiSecurityPpiGuid                        # PPI_NOTIFY SOMETIMES_CONSUMED\r
   gEfiPeiStatusCodePpiGuid                      # PPI SOMETIMES_CONSUMED\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index db4a69f568eab4e4accf57423787290ad0ae5921..5d439f74ac950bd3c1b63933dac3fe857ba9e3ba 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 //\r
 #include <PeiMain.h>\r
 \r
 //\r

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index 0f119c7fb6bdd0226fb341db9621c6f6acb2ca6e..c8bea851a5df7d1ed017421c72b425888eb37e3c 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 VOID\r
 #include <PeiMain.h>\r
 \r
 VOID\r

diff --git a/MdeModulePkg/Core/Pei/Reset/Reset.c b/MdeModulePkg/Core/Pei/Reset/Reset.c
index b0c4b24370de2b252832a2ce432551d9c3f073b2..ef0ceb3b1962d645962093a3af75f6105a70e8f1 100644 (file)
--- a/MdeModulePkg/Core/Pei/Reset/Reset.c
+++ b/MdeModulePkg/Core/Pei/Reset/Reset.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 EFI_STATUS\r
 #include <PeiMain.h>\r
 \r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Core/Pei/Security/Security.c b/MdeModulePkg/Core/Pei/Security/Security.c
index e7c2fbde956dde14b545ebb15609515856f2e002..089995e5297be166318ba8ed9239779123bc24b5 100644 (file)
--- a/MdeModulePkg/Core/Pei/Security/Security.c
+++ b/MdeModulePkg/Core/Pei/Security/Security.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 STATIC\r
 #include <PeiMain.h>\r
 \r
 STATIC\r

diff --git a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c b/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
index 9112c45dc91aacf2ba961c6ee287e34cc6bb631a..b9316b6e9e1141fd53e1ccf42958078b692c0244 100644 (file)
--- a/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
+++ b/MdeModulePkg/Core/Pei/StatusCode/StatusCode.c
@@ -21,11 +21,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include <PeiMain.h>\r
 \r
 EFI_STATUS\r
 #include <PeiMain.h>\r
 \r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/EntryPoint.c b/MdeModulePkg/Library/EdkFvbServiceLib/EntryPoint.c
deleted file mode 100644 (file)
index 9cdf594..0000000
--- a/MdeModulePkg/Library/EdkFvbServiceLib/EntryPoint.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/**@file\r
-  Entry Point Source file.\r
-\r
-  This file contains the user entry point\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-//\r
-// Event for Exit Boot Services Callback\r
-//\r
-STATIC EFI_EVENT mExitBootServicesEvent = NULL;\r
-\r
-/**\r
-  The user Entry Point for module EdkFvbServiceLib. The user code starts with this function.\r
-\r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r
-  @param[in] SystemTable    A pointer to the EFI System Table.\r
-\r
-  @retval EFI_SUCCESS       The entry point is executed successfully.\r
-  @retval other             Some error occurs when executing this entry point.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-InitializeEdkFvbServiceLib(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS              Status;\r
-\r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
-                  TPL_NOTIFY,\r
-                  FvbVirtualAddressChangeNotifyEvent,\r
-                  NULL,\r
-                  &mExitBootServicesEvent\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  return Status;\r
-}\r

diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c
index 4ffc15c38574a5942d0d49fc4e5f94bb3ae87c61..7bc89a0c8732ed24b9372854a4ea75abdb5da2c4 100644 (file)
--- 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.
 \r
 **/\r
 \r
 \r
 **/\r
 \r

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

 #include "Fvb.h"\r
 \r
 //\r
 #include "Fvb.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h
deleted file mode 100644 (file)
index 5a5ef99..0000000
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <Uefi.h>\r
-\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/SimpleTextOut.h>\r
-#include <Guid/GlobalVariable.h>\r
-#include <Guid/ConsoleInDevice.h>\r
-#include <Protocol/DevicePath.h>\r
-#include <Protocol/SimpleTextIn.h>\r
-#include <Guid/HotPlugDevice.h>\r
-#include <Guid/StandardErrorDevice.h>\r
-#include <Guid/ConsoleOutDevice.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/DevicePathLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-//\r
-// Driver Binding Externs\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;\r
-extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
index 146eee62c64673439ce5d1a12e3cb61cd8d516c2..e11dcf3372b2a400e4218239be5f9cf16c80f0ca 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c
@@ -22,8 +22,7 @@ Abstract:
 //\r
 \r
 \r
 //\r
 \r
 \r

-#include "ConPlatform.h"\r
-#include "ComponentName.h"\r
+#include <ConPlatform.h>\r

 \r
 //\r
 // EFI Component Name Protocol\r
 \r
 //\r
 // EFI Component Name Protocol\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h
deleted file mode 100644 (file)
index 17c4348..0000000
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-    ComponentName.h\r
-    \r
-Abstract:\r
-\r
---*/\r
-\r
-#ifndef CON_MANAGE_COMPONENT_NAME_H_\r
-#define CON_MANAGE_COMPONENT_NAME_H_\r
-\r
-\r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-ConPlatformComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ConPlatformComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
index d86ea4766fd9894a1d432dafb6358446fcd69dac..178be23ca52cb583fb6b2b95c53233389ca946a0 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
@@ -17,40 +17,8 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include <Uefi.h>\r
-\r
-#include "ConPlatform.h"\r
-\r
-\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/SimpleTextOut.h>\r
-#include <Guid/GlobalVariable.h>\r
-#include <Guid/ConsoleInDevice.h>\r
-#include <Protocol/DevicePath.h>\r
-#include <Protocol/SimpleTextIn.h>\r
-#include <Guid/HotPlugDevice.h>\r
-#include <Guid/StandardErrorDevice.h>\r
-#include <Guid/ConsoleOutDevice.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/DevicePathLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-//\r
-// Driver Binding Externs\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;\r
-extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;\r
+#include <ConPlatform.h>\r
+\r

 \r
 EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding = {\r
   ConPlatformTextInDriverBindingSupported,\r
 \r
 EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding = {\r
   ConPlatformTextInDriverBindingSupported,\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
index a1035156e5a08ed413cc2dd8d9f9128ace76b7db..f408ede7a4b6d94e379030db0ebca7aa661fd75d 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
@@ -20,10 +20,31 @@ Abstract:
 #ifndef CON_MANAGE_H_\r
 #define CON_MANAGE_H_\r
 \r
 #ifndef CON_MANAGE_H_\r
 #define CON_MANAGE_H_\r
 \r

+#include <Uefi.h>\r
+#include <Protocol/SimpleTextOut.h>\r
+#include <Guid/GlobalVariable.h>\r
+#include <Guid/ConsoleInDevice.h>\r
+#include <Protocol/DevicePath.h>\r
+#include <Protocol/SimpleTextIn.h>\r
+#include <Guid/HotPlugDevice.h>\r
+#include <Guid/StandardErrorDevice.h>\r
+#include <Guid/ConsoleOutDevice.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+\r

 //\r
 //\r

-// Include common header file for this module.\r
+// Driver Binding Externs\r

 //\r
 //\r

-#include "CommonHeader.h"\r
+extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;\r
+extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;\r

 \r
 #define VarConsoleInpDev  L"ConInDev"\r
 #define VarConsoleInp     L"ConIn"\r
 \r
 #define VarConsoleInpDev  L"ConInDev"\r
 #define VarConsoleInp     L"ConIn"\r


@@ -129,4 +150,25 @@ IsHotPlugDevice (
   EFI_HANDLE    ControllerHandle\r
   );\r
 \r
   EFI_HANDLE    ControllerHandle\r
   );\r
 \r

+//\r
+// EFI Component Name Functions\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+ConPlatformComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConPlatformComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf
index ede86983e94129eae85040b2b75195343c6a798a..f8b1d06b1024338efd8786e543af5d7ac8eb14e2 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
 #\r
 #**/\r
 \r

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

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ConPlatform\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ConPlatform\r


@@ -41,38 +36,14 @@
 #  COMPONENT_NAME                =  gConPlatformComponentName                    \r
 #\r
 \r
 #  COMPONENT_NAME                =  gConPlatformComponentName                    \r
 #\r
 \r

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

 [Sources.common]\r
   ComponentName.c\r
 [Sources.common]\r
   ComponentName.c\r

-  ComponentName.h\r

   ConPlatform.h\r
   ConPlatform.c\r
   ConPlatform.h\r
   ConPlatform.c\r

-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r

-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r

 [LibraryClasses]\r
   MemoryAllocationLib\r
   DevicePathLib\r
 [LibraryClasses]\r
   MemoryAllocationLib\r
   DevicePathLib\r


@@ -83,24 +54,9 @@
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
   UefiDriverEntryPoint\r
   DebugLib\r
 \r

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

 [Guids]\r
   gEfiGlobalVariableGuid                        # SOMETIMES_CONSUMED L"ErrOut"\r
 \r
 [Guids]\r
   gEfiGlobalVariableGuid                        # SOMETIMES_CONSUMED L"ErrOut"\r
 \r

-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r

 [Protocols]\r
   gEfiHotPlugDeviceGuid                         # PROTOCOL TO_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 [Protocols]\r
   gEfiHotPlugDeviceGuid                         # PROTOCOL TO_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h
deleted file mode 100644 (file)
index b00a6af..0000000
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-  ComponentName.h\r
-\r
-Abstract:\r
-\r
-  \r
-Revision History\r
-\r
---*/\r
-\r
-#ifndef _GRAPHICS_CONSOLE_COMPONENT_NAME_H\r
-#define _GRAPHICS_CONSOLE_COMPONENT_NAME_H\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-#error\r
-\r
-#endif\r

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

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
index fc92fc986fdfae7ff7a3a9471c67bf6640ce0b6b..8aff74d64e6391796ab59954495106809ac401b1 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "DevicePath.h"\r
 \r
 EFI_HANDLE  mDevicePathHandle = NULL;\r
 #include "DevicePath.h"\r
 \r
 EFI_HANDLE  mDevicePathHandle = NULL;\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index 9473b89e3766df450009da9bc484a55d2b723f3f..f95b13f7a89560f8c7323199be84fa6a9b48b63c 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
@@ -21,10 +21,21 @@ Abstract:
 #ifndef _DEVICE_PATH_DRIVER_H\r
 #define _DEVICE_PATH_DRIVER_H\r
 \r
 #ifndef _DEVICE_PATH_DRIVER_H\r
 #define _DEVICE_PATH_DRIVER_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+#include <Protocol/DevicePathUtilities.h>\r
+#include <Protocol/DebugPort.h>\r
+#include <Protocol/DevicePathToText.h>\r
+#include <Protocol/DevicePathFromText.h>\r
+#include <Guid/PcAnsi.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/PcdLib.h>\r

 \r
 extern const EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid;\r
 extern const EFI_GUID mEfiDevicePathMessagingSASGuid;\r
 \r
 extern const EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid;\r
 extern const EFI_GUID mEfiDevicePathMessagingSASGuid;\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
index 98c3f1a60c8fe9c3528d79ce2f97631dcc8729d5..8258846190321db282767af075aefd19d40bf483 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
@@ -15,11 +15,6 @@
 #\r
 #**/\r
 \r
 #\r
 #**/\r
 \r

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

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DevicePath\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DevicePath\r


@@ -37,40 +32,17 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r

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

 [Sources.common]\r
   DevicePathUtilities.c\r
   DevicePathToText.c\r
   DevicePathFromText.c\r
   DevicePath.h\r
   DevicePath.c\r
 [Sources.common]\r
   DevicePathUtilities.c\r
   DevicePathToText.c\r
   DevicePathFromText.c\r
   DevicePath.h\r
   DevicePath.c\r

-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r

 \r
 [Packages]\r
   MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
 \r
 [Packages]\r
   MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
 \r

-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r

 [LibraryClasses]\r
   PcdLib\r
   DevicePathLib\r
 [LibraryClasses]\r
   PcdLib\r
   DevicePathLib\r


@@ -82,40 +54,18 @@
   PrintLib\r
   DebugLib\r
 \r
   PrintLib\r
   DebugLib\r
 \r

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

 [Guids]\r
   gEfiVTUTF8Guid                                # ALWAYS_CONSUMED\r
   gEfiVT100Guid                                 # ALWAYS_CONSUMED\r
   gEfiVT100PlusGuid                             # ALWAYS_CONSUMED\r
   gEfiPcAnsiGuid                                # ALWAYS_CONSUMED\r
 \r
 [Guids]\r
   gEfiVTUTF8Guid                                # ALWAYS_CONSUMED\r
   gEfiVT100Guid                                 # ALWAYS_CONSUMED\r
   gEfiVT100PlusGuid                             # ALWAYS_CONSUMED\r
   gEfiPcAnsiGuid                                # ALWAYS_CONSUMED\r
 \r

-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r

 [Protocols]\r
   gEfiDevicePathToTextProtocolGuid              # PROTOCOL ALWAYS_PRODUCED\r
   gEfiDevicePathFromTextProtocolGuid            # PROTOCOL ALWAYS_PRODUCED\r
   gEfiDevicePathUtilitiesProtocolGuid           # PROTOCOL ALWAYS_PRODUCED\r
   gEfiDebugPortProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiDevicePathToTextProtocolGuid              # PROTOCOL ALWAYS_PRODUCED\r
   gEfiDevicePathFromTextProtocolGuid            # PROTOCOL ALWAYS_PRODUCED\r
   gEfiDevicePathUtilitiesProtocolGuid           # PROTOCOL ALWAYS_PRODUCED\r
   gEfiDebugPortProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
 \r

-\r
-################################################################################\r
-#\r
-# Pcd FEATURE_FLAG - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r

 [PcdsFeatureFlag.common]\r
   PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid\r
   PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid\r
 [PcdsFeatureFlag.common]\r
   PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid\r
   PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
index 18bb291a94a8e4cafd454cbb20d466cf8ef95e4d..94a4a2b5b7127335b9117402823762a10d44ac55 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "DevicePath.h"\r
 \r
 STATIC\r
 #include "DevicePath.h"\r
 \r
 STATIC\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
index c024ccfba1702eb290ea4122d4e38a547faee17c..f1365baa2626c496da5d82b338b4b8c265cf224f 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "DevicePath.h"\r
 \r
 STATIC\r
 #include "DevicePath.h"\r
 \r
 STATIC\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c
index a78a24d9f5798e4ef9703bc53dc798c93292ba63..548a5349a8f38ded2b6c45e4274560ce54deadb1 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathUtilities.c
@@ -19,11 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "DevicePath.h"\r
 \r
 UINTN\r
 #include "DevicePath.h"\r
 \r
 UINTN\r

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

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index 861de0fa842680deb6394dafcbf40529d3fba704..01a26bb0bf5ed957ae4a064b3a0fb8b5d8c3b414 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -15,11 +15,6 @@ Module Name: Pcd.c
 \r
 **/\r
 \r
 \r
 **/\r
 \r

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

 #include "Service.h"\r
 \r
 EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_CALLBACK);\r
 #include "Service.h"\r
 \r
 EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_CALLBACK);\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index db828ac8d7ac5d7995a1489d511b6eb262490225..0da870ccdef36a60f9590d7e3d4cbde7d4085db5 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
 #\r
 #**/\r
 \r

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

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PcdDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PcdDxe\r


@@ -47,27 +42,9 @@
   Pcd.c\r
   Service.c\r
   Service.h\r
   Pcd.c\r
   Service.c\r
   Service.h\r

-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

-  MdeModulePkg/MdeModulePkg.dec\r
-\r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r

 \r
 [LibraryClasses]\r
   UefiRuntimeServicesTableLib\r
 \r
 [LibraryClasses]\r
   UefiRuntimeServicesTableLib\r


@@ -81,54 +58,18 @@
   BaseLib\r
   PcdLib\r
 \r
   BaseLib\r
   PcdLib\r
 \r

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

 [Guids]\r
   gPcdDataBaseHobGuid                           # ALWAYS_CONSUMED  Hob: GUID_EXTENSION\r
 \r
 [Guids]\r
   gPcdDataBaseHobGuid                           # ALWAYS_CONSUMED  Hob: GUID_EXTENSION\r
 \r

-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r

 [Protocols]\r
   gPcdProtocolGuid                              # PROTOCOL ALWAYS_PRODUCED\r
 \r
 [Protocols]\r
   gPcdProtocolGuid                              # PROTOCOL ALWAYS_PRODUCED\r
 \r

-\r
-################################################################################\r
-#\r
-# Pcd FEATURE_FLAG - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r

 [PcdsFeatureFlag.common]\r
   PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 [PcdsFeatureFlag.common]\r
   PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
 \r

-\r
-################################################################################\r
-#\r
-# Pcd FIXED_AT_BUILD - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r

 [PcdsFixedAtBuild.common]\r
   PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 [PcdsFixedAtBuild.common]\r
   PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid\r
 \r

-\r
-################################################################################\r
-#\r
-# Dependency Expression Section - list of Dependency expressions that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r

 [Depex]\r
   TRUE\r
 \r
 [Depex]\r
   TRUE\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index 96a40291af40fa3469f08be7f32a91055e4f53f7..4403e6ea52e03d764bcb15d9729201eb17fd1515 100644 (file)
--- 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\r
 \r
 **/\r
 Module Name: Service.c\r
 \r
 **/\r

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

 \r
 #include "Service.h"\r
 \r
 \r
 #include "Service.h"\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index ff2ae79e5bd63ac945e094d02b96859a66c03d1b..7ff2b99724a69574ef50d0fb99184d95f5abe653 100644 (file)
--- 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\r
 #define _SERVICE_H\r
 \r
 #ifndef _SERVICE_H\r
 #define _SERVICE_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+#include <Protocol/Pcd.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r

 \r
 //\r
 // Please make sure the PCD Serivce PEIM Version is consistent with\r
 \r
 //\r
 // Please make sure the PCD Serivce PEIM Version is consistent with\r

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

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 450aa857f0911290cc2eb27091a2f28ced37341c..a9022b951baaccf856f92af505756040eff0df74 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -36,7 +36,6 @@
   Service.c\r
   Service.h\r
   Pcd.c\r
   Service.c\r
   Service.h\r
   Pcd.c\r

-  CommonHeader.h\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

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

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c
index 15e84e8b23cf407bb7f7d85aba0ea1ad68b119ed..59403e91e7c71c86df5d5bd4c31cb5110a706029 100644 (file)
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c
+++ b/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c
@@ -19,11 +19,6 @@ Revision History
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 #include "Variable.h"\r
 \r
 //\r
 #include "Variable.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c
index 4322961630c595dabf8f58e919da0a76e561f474..784a1987a8c3991fcf2702571e170b73a6a4ad45 100644 (file)
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c
@@ -21,8 +21,6 @@ Revision History
 \r
 \r
 #include "Variable.h"\r
 \r
 \r
 #include "Variable.h"\r

-#include "reclaim.h"\r
-\r

 #include <Common/FlashMap.h>\r
 \r
 //\r
 #include <Common/FlashMap.h>\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h
index aff0b8265bdad7e2d403e0362ef4867060e7e3ef..904a681c339664876f652a226b806c1f400fb213 100644 (file)
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h
@@ -20,14 +20,25 @@ Abstract:
 #ifndef _VARIABLE_H\r
 #define _VARIABLE_H\r
 \r
 #ifndef _VARIABLE_H\r
 #define _VARIABLE_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-//\r
-// Statements that include other header files\r
-//\r
+#include <PiDxe.h>\r
+#include <Protocol/VariableWrite.h>\r
+#include <Protocol/FaultTolerantWriteLite.h>\r
+#include <Protocol/FirmwareVolumeBlock.h>\r
+#include <Protocol/Variable.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/DxeServicesTableLib.h>\r
+#include <Library/UefiRuntimeLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/FvbServiceLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Common/FlashMap.h>\r
+#include <Guid/FlashMapHob.h>\r

 \r
 //\r
 // BugBug: We need relcate the head file.\r
 \r
 //\r
 // BugBug: We need relcate the head file.\r


@@ -85,24 +96,21 @@ EFIAPI
 VariableCommonInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 VariableCommonInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 VariableServiceInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 VariableServiceInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

-  )\r
-;\r
+  );\r

 \r
 VOID\r
 EFIAPI\r
 VariableClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
 \r
 VOID\r
 EFIAPI\r
 VariableClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -114,8 +122,7 @@ GetVariable (
   OUT     VOID              *Data,\r
   IN      VARIABLE_GLOBAL   * Global,\r
   IN      UINT32            Instance\r
   OUT     VOID              *Data,\r
   IN      VARIABLE_GLOBAL   * Global,\r
   IN      UINT32            Instance\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -125,8 +132,7 @@ GetNextVariableName (
   IN OUT  EFI_GUID          *VendorGuid,\r
   IN      VARIABLE_GLOBAL   *Global,\r
   IN      UINT32            Instance\r
   IN OUT  EFI_GUID          *VendorGuid,\r
   IN      VARIABLE_GLOBAL   *Global,\r
   IN      UINT32            Instance\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -140,8 +146,7 @@ SetVariable (
   IN UINTN                   *VolatileOffset,\r
   IN UINTN                   *NonVolatileOffset,\r
   IN UINT32                  Instance\r
   IN UINTN                   *VolatileOffset,\r
   IN UINTN                   *NonVolatileOffset,\r
   IN UINT32                  Instance\r

-  )\r
-;\r
+  );\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -152,7 +157,19 @@ QueryVariableInfo (
   OUT UINT64                 *MaximumVariableSize,\r
   IN  VARIABLE_GLOBAL        *Global,\r
   IN  UINT32                 Instance\r
   OUT UINT64                 *MaximumVariableSize,\r
   IN  VARIABLE_GLOBAL        *Global,\r
   IN  UINT32                 Instance\r

-  )\r
-;\r
+  );\r
+\r
+EFI_STATUS\r
+GetFvbHandleByAddress (\r
+  IN  EFI_PHYSICAL_ADDRESS   VariableStoreBase,\r
+  OUT EFI_HANDLE             *FvbHandle\r
+  );\r
+\r
+EFI_STATUS\r
+FtwVariableSpace (\r
+  IN EFI_PHYSICAL_ADDRESS   VariableBaseAddress,\r
+  IN UINT8                  *Buffer,\r
+  IN UINTN                  BufferSize\r
+  );\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
index 5765c26f210b8016750b35b44035e6b9ea189622..c2c5878740ff41cc68fcbc2f048631cfdcf08ecc 100644 (file)
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
+++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
 #\r
 #**/\r
 \r

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

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Variable\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Variable\r


@@ -38,38 +33,15 @@
 #  VIRTUAL_ADDRESS_MAP_CALLBACK  =  VariableClassAddressChangeEvent\r
 #\r
 \r
 #  VIRTUAL_ADDRESS_MAP_CALLBACK  =  VariableClassAddressChangeEvent\r
 #\r
 \r

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

 [Sources.common]\r
   InitVariable.c\r
   reclaim.c\r
 [Sources.common]\r
   InitVariable.c\r
   reclaim.c\r

-  reclaim.h\r

   Variable.c\r
   Variable.h\r
   Variable.c\r
   Variable.h\r

-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r

-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r

 [LibraryClasses]\r
   MemoryAllocationLib\r
   BaseLib\r
 [LibraryClasses]\r
   MemoryAllocationLib\r
   BaseLib\r


@@ -87,39 +59,16 @@
 [Guids]\r
   gEfiFlashMapHobGuid\r
 \r
 [Guids]\r
   gEfiFlashMapHobGuid\r
 \r

-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r

 [Protocols]\r
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiFaultTolerantWriteLiteProtocolGuid        # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED\r
   gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED\r
 \r
 [Protocols]\r
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiFaultTolerantWriteLiteProtocolGuid        # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED\r
   gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED\r
 \r

-\r
-################################################################################\r
-#\r
-# Pcd DYNAMIC - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r

 [PcdsDynamic.common]\r
   PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid\r
   PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
 [PcdsDynamic.common]\r
   PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid\r
   PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid\r
 \r

-\r
-################################################################################\r
-#\r
-# Dependency Expression Section - list of Dependency expressions that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r

 [Depex]\r
   gEfiFirmwareVolumeBlockProtocolGuid AND gEfiAlternateFvBlockGuid AND gEfiFaultTolerantWriteLiteProtocolGuid\r
 \r
 [Depex]\r
   gEfiFirmwareVolumeBlockProtocolGuid AND gEfiAlternateFvBlockGuid AND gEfiFaultTolerantWriteLiteProtocolGuid\r
 \r

-\r

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c
index 3ee37367d59fb152b9bdd38e77d3e7d6d7a318f5..0adaa8787cebd23d26cacc17fb17068bcb63567c 100644 (file)
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c
+++ b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c
@@ -23,7 +23,7 @@ Revision History
 --*/\r
 \r
 \r
 --*/\r
 \r
 \r

-#include "reclaim.h"\r
+#include <Variable.h>\r

 #include "Common/Variable.h"\r
 \r
 EFI_STATUS\r
 #include "Common/Variable.h"\r
 \r
 EFI_STATUS\r

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h
deleted file mode 100644 (file)
index 393b590..0000000
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-Module Name:\r
-\r
-  reclaim.h\r
-\r
-Abstract:\r
-\r
-  Definitions for non-volatile variable store garbage collection\r
-\r
-Revision History\r
-\r
---*/\r
-\r
-#ifndef _VAR_RECLAIM_H\r
-#define _VAR_RECLAIM_H\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-//\r
-// Functions\r
-//\r
-EFI_STATUS\r
-GetFvbHandleByAddress (\r
-  IN  EFI_PHYSICAL_ADDRESS   VariableStoreBase,\r
-  OUT EFI_HANDLE             *FvbHandle\r
-  )\r
-;\r
-\r
-EFI_STATUS\r
-FtwVariableSpace (\r
-  IN EFI_PHYSICAL_ADDRESS   VariableBaseAddress,\r
-  IN UINT8                  *Buffer,\r
-  IN UINTN                  BufferSize\r
-  )\r
-;\r
-\r
-#endif\r

diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
index 877ebc97e6cb407f341f83817b1ed5a6a043d4f0..96c538b15a7fe03a5611e99e5572c2e3e6de73d7 100644 (file)
--- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
+++ b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.c
@@ -19,10 +19,9 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <Base.h>\r
+#include <Library/CustomDecompressLib.h>\r
+\r

 \r
 RETURN_STATUS\r
 EFIAPI\r
 \r
 RETURN_STATUS\r
 EFIAPI\r

diff --git a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf
index df8d92e7664a548f2d2d14c7595de8eb6a6a96c3..f7b16b1c04a9c5184a97626220ef44dda8e27149 100644 (file)
--- a/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf
+++ b/MdePkg/Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
 #\r
 #**/\r
 \r

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

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = BaseCustomDecompressLibNull\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = BaseCustomDecompressLibNull\r


@@ -36,23 +31,8 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r

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

 [Sources.common]\r
   BaseCustomDecompressLibNull.c\r
 [Sources.common]\r
   BaseCustomDecompressLibNull.c\r

-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

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

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

diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c b/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c
index 0f3c39096526d7190a0c9f4ee01bc7ba1f09a416..4fc33ee402370d510ed7b9a5ce67bff3c2cf8fba 100644 (file)
--- a/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c
+++ b/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c
@@ -12,10 +12,14 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/PrintLib.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/SerialPortLib.h>\r
+\r

 \r
 //\r
 // Define the maximum debug and assert message length that this library supports \r
 \r
 //\r
 // Define the maximum debug and assert message length that this library supports \r

diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
index b1aeff14f06c12e1740dfee8bcf7a0c9eb731108..37741d67628756792d6fe899a8d13d43a0c15a8c 100644 (file)
--- a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
+++ b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
 #\r
 #**/\r
 \r

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

 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeDebugLibSerialPort\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeDebugLibSerialPort\r


@@ -29,42 +24,18 @@
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r

-\r

 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r

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

 [Sources.common]\r
   DebugLib.c\r
 [Sources.common]\r
   DebugLib.c\r

-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r

 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r

-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
-\r

 [LibraryClasses]\r
   SerialPortLib\r
   BaseMemoryLib\r
 [LibraryClasses]\r
   SerialPortLib\r
   BaseMemoryLib\r


@@ -72,24 +43,10 @@
   PrintLib\r
   BaseLib\r
 \r
   PrintLib\r
   BaseLib\r
 \r

-\r
-################################################################################\r
-#\r
-# Pcd FIXED_AT_BUILD - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r

 [PcdsFixedAtBuild.common]\r
   PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid\r
   PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid\r
 \r
 [PcdsFixedAtBuild.common]\r
   PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid\r
   PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid\r
 \r

-\r
-################################################################################\r
-#\r
-# Pcd DYNAMIC - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r

 [PcdsDynamic.common]\r
   PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid\r
 \r
 [PcdsDynamic.common]\r
   PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid\r
 \r

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

diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
index 6686291aa2eda746212fc284f6ef43d00f4d6c9f..626fa22290a4f400e7a59ab5692f92389f79d3eb 100644 (file)
--- 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.
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 \r
 //\r
 // Get Device Descriptor\r
 \r
 //\r
 // Get Device Descriptor\r

diff --git a/MdePkg/Library/UefiUsbLib/hid.c b/MdePkg/Library/UefiUsbLib/hid.c
index a98fbfb9a1c7c96a7ff31ae5b3b903555c806c74..a1019a0f2d228a301ff4b53b0d4632539279d9f0 100644 (file)
--- 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.
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

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

 \r
 //\r
 // Function to get HID descriptor\r
 \r
 //\r
 // Function to get HID descriptor\r