From 859b72fa7e3ff1cf1d7476a3446af4ebbb5fe3e6 Mon Sep 17 00:00:00 2001 From: AJFISH Date: Tue, 10 Jul 2007 16:13:56 +0000 Subject: Removed CommonHeader.h from MdePkg & MdeModulePkg git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3180 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Console/ConPlatformDxe/CommonHeader.h | 54 ------------------- .../Console/ConPlatformDxe/ComponentName.c | 3 +- .../Console/ConPlatformDxe/ComponentName.h | 45 ---------------- .../Universal/Console/ConPlatformDxe/ConPlatform.c | 36 +------------ .../Universal/Console/ConPlatformDxe/ConPlatform.h | 46 +++++++++++++++- .../Console/ConPlatformDxe/ConPlatform.inf | 44 ---------------- .../Console/GraphicsConsoleDxe/ComponentName.h | 33 ------------ .../Universal/DevicePathDxe/CommonHeader.h | 44 ---------------- MdeModulePkg/Universal/DevicePathDxe/DevicePath.c | 5 -- MdeModulePkg/Universal/DevicePathDxe/DevicePath.h | 19 +++++-- .../Universal/DevicePathDxe/DevicePath.inf | 50 ------------------ .../Universal/DevicePathDxe/DevicePathFromText.c | 5 -- .../Universal/DevicePathDxe/DevicePathToText.c | 5 -- .../Universal/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 - .../Universal/VariableRuntimeDxe/CommonHeader.h | 48 ----------------- .../Universal/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 ------------------ 28 files changed, 114 insertions(+), 645 deletions(-) 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 (limited to 'MdeModulePkg/Universal') diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h deleted file mode 100644 index 5a5ef99..0000000 --- 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 146eee6..e11dcf3 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 17c4348..0000000 --- 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 d86ea47..178be23 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 a103515..f408ede 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 ede8698..f8b1d06 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 b00a6af..0000000 --- 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 24b9be3..0000000 --- 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 fc92fc9..8aff74d 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 9473b89..f95b13f 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 98c3f1a..8258846 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 18bb291..94a4a2b 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 c024ccf..f1365ba 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 a78a24d..548a534 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 f01b863..0000000 --- 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 861de0f..01a26bb 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 db828ac..0da870c 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 96a4029..4403e6e 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 ff2ae79..7ff2b99 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 967f160..0000000 --- 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 450aa85..a9022b9 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 7148577..0000000 --- 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 15e84e8..59403e9 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 4322961..784a198 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 aff0b82..904a681 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 5765c26..c2c5878 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 3ee3736..0adaa87 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 393b590..0000000 --- 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 -- cgit v1.1