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 ------------- 7 files changed, 47 insertions(+), 214 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 (limited to 'MdeModulePkg/Universal/Console') diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h deleted file mode 100644 index 5a5ef994d2..0000000000 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/CommonHeader.h +++ /dev/null @@ -1,54 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include - -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// Driver Binding Externs -// -extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; -extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; - -#endif diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c index 146eee62c6..e11dcf3372 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.c @@ -22,8 +22,7 @@ Abstract: // -#include "ConPlatform.h" -#include "ComponentName.h" +#include // // EFI Component Name Protocol diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h deleted file mode 100644 index 17c43481b6..0000000000 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ComponentName.h +++ /dev/null @@ -1,45 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - ComponentName.h - -Abstract: - ---*/ - -#ifndef CON_MANAGE_COMPONENT_NAME_H_ -#define CON_MANAGE_COMPONENT_NAME_H_ - - -// -// EFI Component Name Functions -// -EFI_STATUS -EFIAPI -ConPlatformComponentNameGetDriverName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN CHAR8 *Language, - OUT CHAR16 **DriverName - ); - -EFI_STATUS -EFIAPI -ConPlatformComponentNameGetControllerName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE ChildHandle OPTIONAL, - IN CHAR8 *Language, - OUT CHAR16 **ControllerName - ); - -#endif diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c index d86ea4766f..178be23ca5 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c @@ -17,40 +17,8 @@ Abstract: --*/ -#include - -#include "ConPlatform.h" - - -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -// -// Driver Binding Externs -// -extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; -extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; +#include + EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding = { ConPlatformTextInDriverBindingSupported, diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h index a1035156e5..f408ede7a4 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h @@ -20,10 +20,31 @@ Abstract: #ifndef CON_MANAGE_H_ #define CON_MANAGE_H_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + // -// Include common header file for this module. +// Driver Binding Externs // -#include "CommonHeader.h" +extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; +extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName; #define VarConsoleInpDev L"ConInDev" #define VarConsoleInp L"ConIn" @@ -129,4 +150,25 @@ IsHotPlugDevice ( EFI_HANDLE ControllerHandle ); +// +// EFI Component Name Functions +// +EFI_STATUS +EFIAPI +ConPlatformComponentNameGetDriverName ( + IN EFI_COMPONENT_NAME_PROTOCOL *This, + IN CHAR8 *Language, + OUT CHAR16 **DriverName + ); + +EFI_STATUS +EFIAPI +ConPlatformComponentNameGetControllerName ( + IN EFI_COMPONENT_NAME_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE ChildHandle OPTIONAL, + IN CHAR8 *Language, + OUT CHAR16 **ControllerName + ); + #endif diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf index ede86983e9..f8b1d06b10 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = ConPlatform @@ -41,38 +36,14 @@ # COMPONENT_NAME = gConPlatformComponentName # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] ComponentName.c - ComponentName.h ConPlatform.h ConPlatform.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - [LibraryClasses] MemoryAllocationLib DevicePathLib @@ -83,24 +54,9 @@ UefiDriverEntryPoint DebugLib - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - [Guids] gEfiGlobalVariableGuid # SOMETIMES_CONSUMED L"ErrOut" - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiHotPlugDeviceGuid # PROTOCOL TO_START gEfiDevicePathProtocolGuid # PROTOCOL TO_START diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h deleted file mode 100644 index b00a6af9fe..0000000000 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h +++ /dev/null @@ -1,33 +0,0 @@ -/*++ - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -Module Name: - - ComponentName.h - -Abstract: - - -Revision History - ---*/ - -#ifndef _GRAPHICS_CONSOLE_COMPONENT_NAME_H -#define _GRAPHICS_CONSOLE_COMPONENT_NAME_H - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - -#error - -#endif -- cgit v1.2.3