From 97a079edfb4b6454b31ccd4db3302655d835d98f Mon Sep 17 00:00:00 2001 From: AJFISH Date: Mon, 9 Jul 2007 23:39:54 +0000 Subject: Updated modules to not depend on the IntelFrameworkPkg. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3162 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Console/ConSplitterDxe/CommonHeader.h | 61 ---------------------- .../Console/ConSplitterDxe/ComponentName.c | 5 -- .../Universal/Console/ConSplitterDxe/ConSplitter.c | 5 -- .../Universal/Console/ConSplitterDxe/ConSplitter.h | 38 +++++++++++++- .../Console/ConSplitterDxe/ConSplitter.inf | 39 -------------- .../Console/ConSplitterDxe/ConSplitterGraphics.c | 11 +--- 6 files changed, 38 insertions(+), 121 deletions(-) delete mode 100644 MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h (limited to 'MdeModulePkg/Universal/Console/ConSplitterDxe') diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h deleted file mode 100644 index 7feaec4..0000000 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h +++ /dev/null @@ -1,61 +0,0 @@ -/**@file - Common header file shared by all source files. - - This file includes package header files, library classes and protocol, PPI & GUID definitions. - - Copyright (c) 2006 - 2007, Intel Corporation - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - -#ifndef __COMMON_HEADER_H_ -#define __COMMON_HEADER_H_ - - -// -// The package level header files this module uses -// -#include -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -// -// Driver Binding Externs -// -extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterConInDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterConInComponentName; -extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterSimplePointerDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterSimplePointerComponentName; -extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterConOutDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterConOutComponentName; -extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterStdErrDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterStdErrComponentName; - - -#endif diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c index 6d1bf15..a6f94a1 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c @@ -17,11 +17,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "ConSplitter.h" // diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c index ead6d65..1c32a0c 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c @@ -27,11 +27,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "ConSplitter.h" // diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h index ac5e337..119cf32 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h @@ -15,10 +15,44 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef _CON_SPLITTER_H_ #define _CON_SPLITTER_H_ +#include +#include +#include +#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 gConSplitterConInDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterConInComponentName; +extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterSimplePointerDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterSimplePointerComponentName; +extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterConOutDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterConOutComponentName; +extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterStdErrDriverBinding; +extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterStdErrComponentName; + +// These definitions were in the old Hii protocol, but are not in the new UEFI +// version. So they are defined locally. +#define UNICODE_NARROW_CHAR 0xFFF0 +#define UNICODE_WIDE_CHAR 0xFFF1 + // // Private Data Structures diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf index a5f95e4..4942360 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf @@ -45,38 +45,14 @@ # COMPONENT_NAME = gConSplitterStdErrComponentName # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] ConSplitterGraphics.c ComponentName.c ConSplitter.h ConSplitter.c - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ [Packages] MdePkg/MdePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ [LibraryClasses] UefiBootServicesTableLib @@ -87,13 +63,6 @@ UefiDriverEntryPoint DebugLib - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - [Guids] gEfiConsoleInDeviceGuid # ALWAYS_CONSUMED gEfiStandardErrorDeviceGuid # ALWAYS_CONSUMED @@ -102,14 +71,6 @@ gEfiPrimaryConsoleInDeviceGuid # ALWAYS_PRODUCED gEfiPrimaryStandardErrorDeviceGuid # ALWAYS_PRODUCED - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiConsoleControlProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiSimplePointerProtocolGuid # PROTOCOL ALWAYS_PRODUCED diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c index 0387324..c3e15d4 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c @@ -22,15 +22,8 @@ Abstract: --*/ - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "ConSplitter.h" -#include static CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL }; @@ -839,8 +832,8 @@ DevNullTextOutOutputString ( break; } - if (*WString == WIDE_CHAR || *WString == NARROW_CHAR) { - CurrentWidth = (*WString == WIDE_CHAR) ? 2 : 1; + if (*WString == UNICODE_WIDE_CHAR || *WString == UNICODE_NARROW_CHAR) { + CurrentWidth = (*WString == UNICODE_WIDE_CHAR) ? 2 : 1; WString++; continue; } -- cgit v1.1