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 --- .../Universal/Console/TerminalDxe/CommonHeader.h | 51 ------------------ .../Universal/Console/TerminalDxe/ComponentName.c | 6 --- .../Universal/Console/TerminalDxe/EntryPoint.c | 56 ------------------- .../Universal/Console/TerminalDxe/Terminal.c | 63 +++++++++++++--------- .../Universal/Console/TerminalDxe/Terminal.h | 25 +++++++-- .../Universal/Console/TerminalDxe/Terminal.inf | 49 +++-------------- .../Universal/Console/TerminalDxe/TerminalConIn.c | 12 ++--- .../Universal/Console/TerminalDxe/TerminalConOut.c | 13 ++--- MdeModulePkg/Universal/Console/TerminalDxe/ansi.c | 5 -- .../Universal/Console/TerminalDxe/vtutf8.c | 6 --- 10 files changed, 72 insertions(+), 214 deletions(-) delete mode 100644 MdeModulePkg/Universal/Console/TerminalDxe/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/Console/TerminalDxe/EntryPoint.c (limited to 'MdeModulePkg/Universal/Console/TerminalDxe') diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/TerminalDxe/CommonHeader.h deleted file mode 100644 index 7aca138d4e..0000000000 --- a/MdeModulePkg/Universal/Console/TerminalDxe/CommonHeader.h +++ /dev/null @@ -1,51 +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 -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -// -// Driver Binding Externs -// -extern EFI_DRIVER_BINDING_PROTOCOL gTerminalDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gTerminalComponentName; - -#endif diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c index 9048326f5a..5db13dc4fa 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c @@ -17,12 +17,6 @@ Abstract: --*/ - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Terminal.h" // diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/EntryPoint.c b/MdeModulePkg/Universal/Console/TerminalDxe/EntryPoint.c deleted file mode 100644 index a8feebb1d1..0000000000 --- a/MdeModulePkg/Universal/Console/TerminalDxe/EntryPoint.c +++ /dev/null @@ -1,56 +0,0 @@ -/**@file - Entry Point Source file. - - This file contains the user entry point - - Copyright (c) 2006 - 2007, Intel Corporation - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -**/ - - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - -/** - The user Entry Point for module Terminal. The user code starts with this function. - - @param[in] ImageHandle The firmware allocated handle for the EFI image. - @param[in] SystemTable A pointer to the EFI System Table. - - @retval EFI_SUCCESS The entry point is executed successfully. - @retval other Some error occurs when executing this entry point. - -**/ -EFI_STATUS -EFIAPI -InitializeTerminal( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - - // - // Install driver model protocol(s). - // - Status = EfiLibInstallAllDriverProtocols ( - ImageHandle, - SystemTable, - &gTerminalDriverBinding, - ImageHandle, - &gTerminalComponentName, - NULL, - NULL - ); - ASSERT_EFI_ERROR (Status); - - - return Status; -} diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c index 01ab587bd6..4860a4b210 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c @@ -20,15 +20,9 @@ Revision History: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" #include "Terminal.h" -#include "FrameworkDxe.h" - // // Globals // @@ -195,15 +189,6 @@ TerminalDriverBindingStart ( if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) { return Status; } - // - // Report that the remote terminal is being enabled - // - DevicePath = ParentDevicePath; - REPORT_STATUS_CODE_WITH_DEVICE_PATH ( - EFI_PROGRESS_CODE, - EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_ENABLE, - DevicePath - ); // // Open the Serial I/O Protocol BY_DRIVER. It might already be started. @@ -584,7 +569,7 @@ ReportError: // REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_ERROR_CODE | EFI_ERROR_MINOR, - EFI_PERIPHERAL_LOCAL_CONSOLE | EFI_P_EC_CONTROLLER_ERROR, + PcdGet32 (PcdStatusCodeValueRemoteConsoleError), DevicePath ); @@ -672,14 +657,6 @@ TerminalDriverBindingStop ( if (EFI_ERROR (Status)) { return Status; } - // - // Report that the remote terminal is being disabled - // - REPORT_STATUS_CODE_WITH_DEVICE_PATH ( - EFI_PROGRESS_CODE, - EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_DISABLE, - DevicePath - ); // // Complete all outstanding transactions to Controller. @@ -1192,3 +1169,41 @@ InitializeEfiKeyFiFo ( // TerminalDevice->EfiKeyFiFo.Head = TerminalDevice->EfiKeyFiFo.Tail; } + + +/** + The user Entry Point for module Terminal. The user code starts with this function. + + @param[in] ImageHandle The firmware allocated handle for the EFI image. + @param[in] SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The entry point is executed successfully. + @retval other Some error occurs when executing this entry point. + +**/ +EFI_STATUS +EFIAPI +InitializeTerminal( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + // + // Install driver model protocol(s). + // + Status = EfiLibInstallAllDriverProtocols ( + ImageHandle, + SystemTable, + &gTerminalDriverBinding, + ImageHandle, + &gTerminalComponentName, + NULL, + NULL + ); + ASSERT_EFI_ERROR (Status); + + + return Status; +} diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h index 7ec24b3091..5a7dc0e3e7 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h @@ -23,10 +23,27 @@ Revision History #ifndef _TERMINAL_H #define _TERMINAL_H -// -// Include common header file for this module. -// -#include "CommonHeader.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + #define RAW_FIFO_MAX_NUMBER 256 #define FIFO_MAX_NUMBER 128 diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf index 358db95606..a3add0c7e4 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Terminal @@ -39,12 +34,6 @@ # COMPONENT_NAME = gTerminalComponentName # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] ComponentName.c vtutf8.c @@ -53,27 +42,9 @@ TerminalConIn.c Terminal.c Terminal.h - CommonHeader.h - EntryPoint.c - - -################################################################################ -# -# 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] DevicePathLib @@ -85,13 +56,7 @@ UefiLib UefiDriverEntryPoint DebugLib - - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ + PcdLib [Guids] gEfiGlobalVariableGuid # SOMETIMES_CONSUMED L"ErrOutDev" @@ -101,13 +66,6 @@ gEfiPcAnsiGuid # SOMETIMES_CONSUMED -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiHotPlugDeviceGuid # PROTOCOL SOMETIMES_CONSUMED gEfiSerialIoProtocolGuid # PROTOCOL TO_START @@ -115,3 +73,8 @@ gEfiSimpleTextInProtocolGuid # PROTOCOL BY_START gEfiSimpleTextOutProtocolGuid # PROTOCOL BY_START +[PcdsFixedAtBuild] + PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid + PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid + PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid + PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c index 952024b712..2d76e38c33 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c @@ -12,14 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Terminal.h" -#include "FrameworkDxe.h" EFI_STATUS EFIAPI @@ -60,7 +54,7 @@ TerminalConInReset ( // REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_PROGRESS_CODE, - EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET, + PcdGet32 (PcdStatusCodeValueRemoteConsoleReset), TerminalDevice->DevicePath ); @@ -76,7 +70,7 @@ TerminalConInReset ( if (EFI_ERROR (Status)) { REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_ERROR_CODE | EFI_ERROR_MINOR, - EFI_PERIPHERAL_LOCAL_CONSOLE | EFI_P_EC_CONTROLLER_ERROR, + PcdGet32 (PcdStatusCodeValueRemoteConsoleError), TerminalDevice->DevicePath ); } @@ -313,7 +307,7 @@ TerminalConInCheckForKey ( if (Status == EFI_DEVICE_ERROR) { REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_ERROR_CODE | EFI_ERROR_MINOR, - EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR, + PcdGet32 (PcdStatusCodeValueRemoteConsoleInputError), TerminalDevice->DevicePath ); } diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c index b5a9f33e14..1931c22886 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c @@ -19,15 +19,8 @@ Abstract: Revision History --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Terminal.h" -#include "FrameworkDxe.h" - // // This list is used to define the valid extend chars. // It also provides a mapping from Unicode to PCANSI or @@ -145,7 +138,7 @@ TerminalConOutReset ( // REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_PROGRESS_CODE, - EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET, + PcdGet32 (PcdStatusCodeValueRemoteConsoleReset), TerminalDevice->DevicePath ); @@ -156,7 +149,7 @@ TerminalConOutReset ( // REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_ERROR_CODE | EFI_ERROR_MINOR, - EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR, + PcdGet32 (PcdStatusCodeValueRemoteConsoleError), TerminalDevice->DevicePath ); @@ -360,7 +353,7 @@ TerminalConOutOutputString ( OutputError: REPORT_STATUS_CODE_WITH_DEVICE_PATH ( EFI_ERROR_CODE | EFI_ERROR_MINOR, - EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR, + PcdGet32 (PcdStatusCodeValueRemoteConsoleOutputError), TerminalDevice->DevicePath ); diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/ansi.c b/MdeModulePkg/Universal/Console/TerminalDxe/ansi.c index c3ebe245bf..babc4bbedc 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/ansi.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/ansi.c @@ -20,11 +20,6 @@ Revision History --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Terminal.h" VOID diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/vtutf8.c b/MdeModulePkg/Universal/Console/TerminalDxe/vtutf8.c index 72e0920c8a..648344a279 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/vtutf8.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/vtutf8.c @@ -19,12 +19,6 @@ Abstract: Revision History --*/ - -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Terminal.h" VOID -- cgit v1.2.3