From 97a079edfb4b6454b31ccd4db3302655d835d98f Mon Sep 17 00:00:00 2001 From: AJFISH Date: Mon, 9 Jul 2007 23:39:54 +0000 Subject: [PATCH] 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 --- MdeModulePkg/MdeModulePkg.dsc | 6 +- .../Console/ConSplitterDxe/CommonHeader.h | 61 ----------------- .../Console/ConSplitterDxe/ComponentName.c | 5 -- .../Console/ConSplitterDxe/ConSplitter.c | 5 -- .../Console/ConSplitterDxe/ConSplitter.h | 38 ++++++++++- .../Console/ConSplitterDxe/ConSplitter.inf | 39 ----------- .../ConSplitterDxe/ConSplitterGraphics.c | 11 +--- .../Console/GraphicsConsoleDxe/CommonHeader.h | 47 ------------- .../GraphicsConsoleDxe/ComponentName.c | 5 -- .../GraphicsConsoleDxe/ComponentName.h | 25 +------ .../Console/GraphicsConsoleDxe/EntryPoint.c | 56 ---------------- .../GraphicsConsoleDxe/GraphicsConsole.c | 43 ++++++++++-- .../GraphicsConsoleDxe/GraphicsConsole.h | 36 +++++++++- .../GraphicsConsoleDxe/GraphicsConsole.inf | 51 +------------- .../Console/GraphicsConsoleDxe/LaffStd.c | 5 -- .../Console/TerminalDxe/CommonHeader.h | 51 -------------- .../Console/TerminalDxe/ComponentName.c | 6 -- .../Console/TerminalDxe/EntryPoint.c | 56 ---------------- .../Universal/Console/TerminalDxe/Terminal.c | 63 +++++++++++------- .../Universal/Console/TerminalDxe/Terminal.h | 25 +++++-- .../Console/TerminalDxe/Terminal.inf | 49 ++------------ .../Console/TerminalDxe/TerminalConIn.c | 12 +--- .../Console/TerminalDxe/TerminalConOut.c | 13 +--- .../Universal/Console/TerminalDxe/ansi.c | 5 -- .../Universal/Console/TerminalDxe/vtutf8.c | 6 -- MdeModulePkg/Universal/PCD/Pei/CommonHeader.h | 22 +------ MdeModulePkg/Universal/PCD/Pei/Pcd.c | 5 -- MdeModulePkg/Universal/PCD/Pei/Pcd.inf | 66 +------------------ MdeModulePkg/Universal/PCD/Pei/Service.c | 18 ++--- MdeModulePkg/Universal/PCD/Pei/Service.h | 16 +++-- MdePkg/MdePkg.dec | 6 +- MdePkg/MdePkg.dsc | 4 +- Nt32Pkg/Nt32Pkg.dsc | 7 +- 33 files changed, 222 insertions(+), 641 deletions(-) delete mode 100644 MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/Console/GraphicsConsoleDxe/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/Console/GraphicsConsoleDxe/EntryPoint.c delete mode 100644 MdeModulePkg/Universal/Console/TerminalDxe/CommonHeader.h delete mode 100644 MdeModulePkg/Universal/Console/TerminalDxe/EntryPoint.c diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index d4c0d46a92..1b94448f65 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -21,7 +21,7 @@ # ################################################################################ [Defines] - PLATFORM_NAME = MdeModuleAll + PLATFORM_NAME = MdeModule PLATFORM_GUID = 587CE499-6CBE-43cd-94E2-186218569478 PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 @@ -351,6 +351,10 @@ PcdStatusCodeValueMemoryTestStarted|gEfiMdePkgTokenSpaceGuid|0x00051006 # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP PcdStatusCodeValueSetVirtualAddressMap|gEfiMdePkgTokenSpaceGuid|0x03101004 # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid|0x0005100 # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3 + PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid|0x01040006 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR + PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid|0x01040001 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET + PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid|0x01040007 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR + PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid|0x01040008 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR [PcdsPatchableInModule.common] PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000000 diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h deleted file mode 100644 index 7feaec4161..0000000000 --- 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 6d1bf15a21..a6f94a1bdd 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 ead6d654d8..1c32a0c6ef 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 ac5e337689..119cf32fa6 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 a5f95e4bc1..4942360d6a 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 0387324fcf..c3e15d4ac9 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; } diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/CommonHeader.h deleted file mode 100644 index ad94d88d86..0000000000 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/CommonHeader.h +++ /dev/null @@ -1,47 +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 -// -// Driver Binding Externs -// -extern EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding; -extern EFI_COMPONENT_NAME_PROTOCOL gGraphicsConsoleComponentName; - -#endif diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c index b739e13564..5c615ba1c8 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c @@ -17,11 +17,6 @@ Abstract: --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "GraphicsConsole.h" // diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h index 1067b96677..b00a6af9fe 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h @@ -28,29 +28,6 @@ Revision History // #include "CommonHeader.h" -extern EFI_COMPONENT_NAME_PROTOCOL gGraphicsConsoleComponentName; - -// -// EFI Component Name Functions -// -EFI_STATUS -EFIAPI -GraphicsConsoleComponentNameGetDriverName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN CHAR8 *Language, - OUT CHAR16 **DriverName - ) -; - -EFI_STATUS -EFIAPI -GraphicsConsoleComponentNameGetControllerName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE ChildHandle OPTIONAL, - IN CHAR8 *Language, - OUT CHAR16 **ControllerName - ) -; +#error #endif diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/EntryPoint.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/EntryPoint.c deleted file mode 100644 index 627ad4109d..0000000000 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/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 GraphicsConsole. 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 -InitializeGraphicsConsole( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - - // - // Install driver model protocol(s). - // - Status = EfiLibInstallAllDriverProtocols ( - ImageHandle, - SystemTable, - &gGraphicsConsoleDriverBinding, - ImageHandle, - &gGraphicsConsoleComponentName, - NULL, - NULL - ); - ASSERT_EFI_ERROR (Status); - - - return Status; -} diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c index aecbb206a9..13c5d69991 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c @@ -17,11 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "GraphicsConsole.h" STATIC @@ -1824,3 +1819,41 @@ EraseCursor ( return EFI_SUCCESS; } + +/** + The user Entry Point for module GraphicsConsole. 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 +InitializeGraphicsConsole ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + + // + // Install driver model protocol(s). + // + Status = EfiLibInstallAllDriverProtocols ( + ImageHandle, + SystemTable, + &gGraphicsConsoleDriverBinding, + ImageHandle, + &gGraphicsConsoleComponentName, + NULL, + NULL + ); + ASSERT_EFI_ERROR (Status); + + + return Status; +} + diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h index 73daaa3b43..cc25e1f35c 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h @@ -23,13 +23,43 @@ Revision History #ifndef _GRAPHICS_CONSOLE_H #define _GRAPHICS_CONSOLE_H +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +extern EFI_COMPONENT_NAME_PROTOCOL gGraphicsConsoleComponentName; // -// Include common header file for this module. +// EFI Component Name Functions // -#include "CommonHeader.h" +EFI_STATUS +EFIAPI +GraphicsConsoleComponentNameGetDriverName ( + IN EFI_COMPONENT_NAME_PROTOCOL *This, + IN CHAR8 *Language, + OUT CHAR16 **DriverName + ); -#include "ComponentName.h" +EFI_STATUS +EFIAPI +GraphicsConsoleComponentNameGetControllerName ( + IN EFI_COMPONENT_NAME_PROTOCOL *This, + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE ChildHandle OPTIONAL, + IN CHAR8 *Language, + OUT CHAR16 **ControllerName + ); // // Glyph database diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf index 229f916db8..24d4016687 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = GraphicsConsole @@ -39,40 +34,16 @@ # COMPONENT_NAME = gGraphicsConsoleComponentName # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] ComponentName.c - ComponentName.h LaffStd.c GraphicsConsole.c GraphicsConsole.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. -# -################################################################################ + # currently use Hii for glyph lookup, need to change to UEFI scheme + IntelFrameworkPkg/IntelFrameworkPkg.dec [LibraryClasses] UefiBootServicesTableLib @@ -83,24 +54,6 @@ DebugLib HiiLib - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - -[Guids] - - - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - [Protocols] gEfiDevicePathProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiSimpleTextOutProtocolGuid # PROTOCOL BY_START diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c index d91f91fd89..ac8dd16833 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c @@ -20,11 +20,6 @@ Revision History --*/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "GraphicsConsole.h" EFI_NARROW_GLYPH UsStdNarrowGlyphData[] = { 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 diff --git a/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h b/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h index c488c38e9e..967f160688 100644 --- a/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h +++ b/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h @@ -15,26 +15,6 @@ #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 -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include +#error #endif diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c index b018e5a95d..daaba4b539 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c @@ -14,11 +14,6 @@ Module Name: Pcd.c **/ -// -// Include common header file for this module. -// -#include "CommonHeader.h" - #include "Service.h" diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf index 64c01458b5..450aa857f0 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf @@ -14,11 +14,6 @@ # #**/ -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PcdPeim @@ -37,38 +32,15 @@ # VALID_ARCHITECTURES = IA32 X64 IPF EBC # -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - [Sources.common] Service.c Service.h Pcd.c CommonHeader.h - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ - [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ [LibraryClasses] BaseMemoryLib @@ -80,36 +52,15 @@ PeimEntryPoint DebugLib - -################################################################################ -# -# Guid C Name Section - list of Guids that this module uses or produces. -# -################################################################################ - [Guids] gPcdPeiCallbackFnTableHobGuid # ALWAYS_PRODUCED Hob: GUID_EXTENSION gPcdDataBaseHobGuid # ALWAYS_PRODUCED Hob: GUID_EXTENSION -################################################################################ -# -# PPI C Name Section - list of PPI and PPI Notify C Names that this module -# uses or produces. -# -################################################################################ - [Ppis] - gEfiPeiReadOnlyVariablePpiGuid # PPI ALWAYS_CONSUMED + gEfiPeiReadOnlyVariable2PpiGuid # PPI ALWAYS_CONSUMED gPcdPpiGuid # PPI ALWAYS_PRODUCED - -################################################################################ -# -# Pcd FEATURE_FLAG - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsFeatureFlag.common] PcdPeiPcdDatabaseSetEnabled|gEfiMdeModulePkgTokenSpaceGuid PcdPeiPcdDatabaseGetSizeEnabled|gEfiMdeModulePkgTokenSpaceGuid @@ -117,25 +68,10 @@ PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiMdeModulePkgTokenSpaceGuid PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid - -################################################################################ -# -# Pcd FIXED_AT_BUILD - list of PCDs that this module is coded for. -# -################################################################################ - [PcdsFixedAtBuild.common] PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid - -################################################################################ -# -# Dependency Expression Section - list of Dependency expressions that are required for -# this module. -# -################################################################################ - [Depex] TRUE diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c index cb980daa39..16a5cc8489 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Service.c +++ b/MdeModulePkg/Universal/PCD/Pei/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" @@ -171,28 +167,28 @@ GetHiiVariable ( UINTN Size; EFI_STATUS Status; VOID *Buffer; - EFI_PEI_READ_ONLY_VARIABLE_PPI *VariablePpi; + EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariablePpi; - Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi); + Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &VariablePpi); ASSERT_EFI_ERROR (Status); Size = 0; - Status = VariablePpi->PeiGetVariable ( - GetPeiServicesTablePointer (), + Status = VariablePpi->GetVariable ( + VariablePpi, VariableName, (EFI_GUID *) VariableGuid, NULL, &Size, NULL - ); + ); if (Status == EFI_BUFFER_TOO_SMALL) { Status = PeiServicesAllocatePool (Size, &Buffer); ASSERT_EFI_ERROR (Status); - Status = VariablePpi->PeiGetVariable ( - GetPeiServicesTablePointer (), + Status = VariablePpi->GetVariable ( + VariablePpi, (UINT16 *) VariableName, (EFI_GUID *) VariableGuid, NULL, diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h index 334c399436..fcfdda30e3 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Service.h +++ b/MdeModulePkg/Universal/PCD/Pei/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 + // // Please make sure the PCD Serivce PEIM Version is consistent with diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index fc895cc812..5680f85127 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -196,7 +196,6 @@ # ################################################################################ [Protocols.common] - gEfiBdsArchProtocolGuid = { 0x665E3FF6, 0x46CC, 0x11D4, { 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }} gEfiCpuArchProtocolGuid = { 0x26BACCB1, 0x6F42, 0x11D4, { 0xBC, 0xE7, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }} gEfiMetronomeArchProtocolGuid = { 0x26BACCB2, 0x6F42, 0x11D4, { 0xBC, 0xE7, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }} @@ -325,13 +324,16 @@ PcdStatusCodeValueSetVirtualAddressMap|0x0000000e|gEfiMdePkgTokenSpaceGuid|UINT32|0x03101004 # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP PcdStatusCodeValueMemoryTestStarted|0x0000000f|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051006 # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST PcdStatusCodeValueUncorrectableMemoryError|0x00000010|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051003 # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE + PcdStatusCodeValueRemoteConsoleError|0x00000011|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040006 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR + PcdStatusCodeValueRemoteConsoleReset|0x00000012|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040001 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET + PcdStatusCodeValueRemoteConsoleInputError|0x00000013|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040007 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR + PcdStatusCodeValueRemoteConsoleOutputError|0x00000014|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040008 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR [PcdsPatchableInModule.common] PcdDebugPrintErrorLevel|0x00000006|gEfiMdePkgTokenSpaceGuid|UINT32|0x80000000 PcdPciExpressBaseAddress|0x0000000a|gEfiMdePkgTokenSpaceGuid|UINT64|0xE0000000 PcdFSBClock|0x0000000c|gEfiMdePkgTokenSpaceGuid|UINT32|200000000 - [PcdsFixedAtBuild.IPF] PcdIoBlockBaseAddressForIpf|0x0000000c|gEfiMdePkgTokenSpaceGuid|UINT64|0x0ffffc000000 diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index 0f51017f46..c800333dc1 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -21,11 +21,11 @@ # ################################################################################ [Defines] - PLATFORM_NAME = MdePkgAll + PLATFORM_NAME = Mde PLATFORM_GUID = 082F8BFC-0455-4859-AE3C-ECD64FB81642 PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 - OUTPUT_DIRECTORY = $(WORKSPACE)\Build/Mde + OUTPUT_DIRECTORY = $(WORKSPACE)/Build/Mde SUPPORTED_ARCHITECTURES = IA32|IPF|X64|EBC BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 3efe8310b5..5443406cb8 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -26,7 +26,7 @@ PLATFORM_GUID = EB216561-961F-47EE-9EF9-CA426EF547C2 PLATFORM_VERSION = 0.3 DSC_SPECIFICATION = 0x00010005 - OUTPUT_DIRECTORY = $(WORKSPACE)/Build/Nt32Platform + OUTPUT_DIRECTORY = $(WORKSPACE)/Build/NT32 SUPPORTED_ARCHITECTURES = IA32 BUILD_TARGETS = DEBUG SKUID_IDENTIFIER = DEFAULT @@ -276,6 +276,11 @@ PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid|0x2000 PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid|0x280000 PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid|0x00c000 + PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid|0x0005100 # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3 + PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid|0x01040006 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR + PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid|0x01040001 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET + PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid|0x01040007 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR + PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid|0x01040008 # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR [PcdsFeatureFlag.IA32] PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE -- 2.39.2