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

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index d4c0d46a92be60b393203a9bc50f7cfd9f6efe81..1b94448f654bf2d6feb7d6017151435c2619e1a6 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -21,7 +21,7 @@
 #\r
 ################################################################################\r
 [Defines]\r
-  PLATFORM_NAME                  = MdeModuleAll\r
+  PLATFORM_NAME                  = MdeModule\r
   PLATFORM_GUID                  = 587CE499-6CBE-43cd-94E2-186218569478\r
   PLATFORM_VERSION               = 0.1\r
   DSC_SPECIFICATION              = 0x00010005\r
@@ -351,6 +351,10 @@
   PcdStatusCodeValueMemoryTestStarted|gEfiMdePkgTokenSpaceGuid|0x00051006         # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP\r
   PcdStatusCodeValueSetVirtualAddressMap|gEfiMdePkgTokenSpaceGuid|0x03101004      # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST\r
   PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid|0x0005100   # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3\r
+  PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR\r
+  PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET\r
+  PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR\r
+  PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR\r
 \r
 [PcdsPatchableInModule.common]\r
   PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000000\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h
deleted file mode 100644 (file)
index 7feaec4..0000000
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/CommonHeader.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Guid/PrimaryStandardErrorDevice.h>\r
-#include <Guid/PrimaryConsoleOutDevice.h>\r
-#include <Protocol/GraphicsOutput.h>\r
-#include <Guid/PrimaryConsoleInDevice.h>\r
-#include <Protocol/SimplePointer.h>\r
-#include <Protocol/SimpleTextOut.h>\r
-#include <Guid/ConsoleInDevice.h>\r
-#include <Protocol/SimpleTextIn.h>\r
-#include <Protocol/ConsoleControl.h>\r
-#include <Guid/StandardErrorDevice.h>\r
-#include <Guid/ConsoleOutDevice.h>\r
-#include <Protocol/UgaDraw.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-//\r
-// Driver Binding Externs\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterConInDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterConInComponentName;\r
-extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterSimplePointerDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterSimplePointerComponentName;\r
-extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterConOutDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterConOutComponentName;\r
-extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterStdErrDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterStdErrComponentName;\r
-\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
index 6d1bf15a215d35569b9aef77f1d9a7f8bf408085..a6f94a1bdd435d6a9ea27d2c60715818c3950060 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ComponentName.c
@@ -17,11 +17,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "ConSplitter.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index ead6d654d8f15a7ba8b492d7910d9d68e8b7ca5d..1c32a0c6ef765bb3a1a1593456365d4461ec4275 100644 (file)
--- 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.
 \r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "ConSplitter.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index ac5e3376897c9f4ad251479c6bd7e16bb10d87f2..119cf32fa6b1d6fb6338be34d4d53c45c864accc 100644 (file)
--- 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_\r
 #define _CON_SPLITTER_H_\r
 \r
+#include <PiDxe.h>\r
+#include <Guid/PrimaryStandardErrorDevice.h>\r
+#include <Guid/PrimaryConsoleOutDevice.h>\r
+#include <Protocol/GraphicsOutput.h>\r
+#include <Guid/PrimaryConsoleInDevice.h>\r
+#include <Protocol/SimplePointer.h>\r
+#include <Protocol/SimpleTextOut.h>\r
+#include <Guid/ConsoleInDevice.h>\r
+#include <Protocol/SimpleTextIn.h>\r
+#include <Protocol/ConsoleControl.h>\r
+#include <Guid/StandardErrorDevice.h>\r
+#include <Guid/ConsoleOutDevice.h>\r
+#include <Protocol/UgaDraw.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+\r
 //\r
-// Include common header file for this module.\r
+// Driver Binding Externs\r
 //\r
-#include "CommonHeader.h"\r
+extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterConInDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterConInComponentName;\r
+extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterSimplePointerDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterSimplePointerComponentName;\r
+extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterConOutDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterConOutComponentName;\r
+extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterStdErrDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterStdErrComponentName;\r
+\r
+// These definitions were in the old Hii protocol, but are not in the new UEFI\r
+// version. So they are defined locally.\r
+#define UNICODE_NARROW_CHAR   0xFFF0\r
+#define UNICODE_WIDE_CHAR     0xFFF1 \r
+\r
 \r
 //\r
 // Private Data Structures\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf
index a5f95e4bc1f34d603a4e94db9c574f72b5c7c5ea..4942360d6a7f47ee586be07fd561e2a2fc1612c0 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf
@@ -45,38 +45,14 @@
 #  COMPONENT_NAME                =  gConSplitterStdErrComponentName              \r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   ConSplitterGraphics.c\r
   ComponentName.c\r
   ConSplitter.h\r
   ConSplitter.c\r
-  CommonHeader.h\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-\r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
 \r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
@@ -87,13 +63,6 @@
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
-\r
-################################################################################\r
-#\r
-# Guid C Name Section - list of Guids that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Guids]\r
   gEfiConsoleInDeviceGuid                       # ALWAYS_CONSUMED\r
   gEfiStandardErrorDeviceGuid                   # ALWAYS_CONSUMED\r
@@ -102,14 +71,6 @@
   gEfiPrimaryConsoleInDeviceGuid                # ALWAYS_PRODUCED\r
   gEfiPrimaryStandardErrorDeviceGuid            # ALWAYS_PRODUCED\r
 \r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_PRODUCED\r
   gEfiSimplePointerProtocolGuid                 # PROTOCOL ALWAYS_PRODUCED\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index 0387324fcf03eefc487025c9cc50e797aba6ed10..c3e15d4ac9bfafe911b0e36b06793760e9d16cc2 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -22,15 +22,8 @@ Abstract:
 \r
 --*/\r
 \r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "ConSplitter.h"\r
 \r
-#include <Protocol/FrameworkHii.h>\r
 \r
 static CHAR16 mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
 \r
@@ -839,8 +832,8 @@ DevNullTextOutOutputString (
           break;\r
         }\r
 \r
-        if (*WString == WIDE_CHAR || *WString == NARROW_CHAR) {\r
-          CurrentWidth = (*WString == WIDE_CHAR) ? 2 : 1;\r
+        if (*WString == UNICODE_WIDE_CHAR || *WString == UNICODE_NARROW_CHAR) {\r
+          CurrentWidth = (*WString == UNICODE_WIDE_CHAR) ? 2 : 1;\r
           WString++;\r
           continue;\r
         }\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/CommonHeader.h
deleted file mode 100644 (file)
index ad94d88..0000000
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/CommonHeader.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/FrameworkHii.h>\r
-#include <Protocol/SimpleTextOut.h>\r
-#include <Protocol/GraphicsOutput.h>\r
-#include <Protocol/UgaDraw.h>\r
-#include <Protocol/DevicePath.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/HiiLibFramework.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-//\r
-// Driver Binding Externs\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gGraphicsConsoleComponentName;\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
index b739e13564294ca15d2f73a6d6b29dc4aeae7e33..5c615ba1c85b32f9be19beff84400ae87504b09d 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.c
@@ -17,11 +17,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "GraphicsConsole.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h
index 1067b966772a156fc089ad942009a74d53977a09..b00a6af9fead6dae4145c9aedbf9d1cf8404e673 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/ComponentName.h
@@ -28,29 +28,6 @@ Revision History
 //\r
 #include "CommonHeader.h"\r
 \r
-extern EFI_COMPONENT_NAME_PROTOCOL  gGraphicsConsoleComponentName;\r
-\r
-//\r
-// EFI Component Name Functions\r
-//\r
-EFI_STATUS\r
-EFIAPI\r
-GraphicsConsoleComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  )\r
-;\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-GraphicsConsoleComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  )\r
-;\r
+#error\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/EntryPoint.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/EntryPoint.c
deleted file mode 100644 (file)
index 627ad41..0000000
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/EntryPoint.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/**@file\r
-  Entry Point Source file.\r
-\r
-  This file contains the user entry point \r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-/**\r
-  The user Entry Point for module GraphicsConsole. The user code starts with this function.\r
-\r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
-  @param[in] SystemTable    A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS       The entry point is executed successfully.\r
-  @retval other             Some error occurs when executing this entry point.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-InitializeGraphicsConsole(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS              Status;\r
-\r
-  //\r
-  // Install driver model protocol(s).\r
-  //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
-             ImageHandle,\r
-             SystemTable,\r
-             &gGraphicsConsoleDriverBinding,\r
-             ImageHandle,\r
-             &gGraphicsConsoleComponentName,\r
-             NULL,\r
-             NULL\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-\r
-  return Status;\r
-}\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index aecbb206a95f3227c7a2d6104392e2b5757c0ac0..13c5d699912b4d930ae6c4f3328b8b1db336fdd7 100644 (file)
--- 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.
 \r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "GraphicsConsole.h"\r
 \r
 STATIC\r
@@ -1824,3 +1819,41 @@ EraseCursor (
 \r
   return EFI_SUCCESS;\r
 }\r
+\r
+/**\r
+  The user Entry Point for module GraphicsConsole. The user code starts with this function.\r
+\r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] SystemTable    A pointer to the EFI System Table.\r
+  \r
+  @retval EFI_SUCCESS       The entry point is executed successfully.\r
+  @retval other             Some error occurs when executing this entry point.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+InitializeGraphicsConsole (\r
+  IN EFI_HANDLE           ImageHandle,\r
+  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  )\r
+{\r
+  EFI_STATUS              Status;\r
+\r
+  //\r
+  // Install driver model protocol(s).\r
+  //\r
+  Status = EfiLibInstallAllDriverProtocols (\r
+             ImageHandle,\r
+             SystemTable,\r
+             &gGraphicsConsoleDriverBinding,\r
+             ImageHandle,\r
+             &gGraphicsConsoleComponentName,\r
+             NULL,\r
+             NULL\r
+             );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+\r
+  return Status;\r
+}\r
+\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
index 73daaa3b43e09b6bb29d47edae1b9d01b4047b39..cc25e1f35ce965951b1b5c115e00484b66e3fb4e 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
@@ -23,13 +23,43 @@ Revision History
 #ifndef _GRAPHICS_CONSOLE_H\r
 #define _GRAPHICS_CONSOLE_H\r
 \r
+#include <PiDxe.h>\r
+#include <Protocol/FrameworkHii.h>\r
+#include <Protocol/SimpleTextOut.h>\r
+#include <Protocol/GraphicsOutput.h>\r
+#include <Protocol/UgaDraw.h>\r
+#include <Protocol/DevicePath.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/HiiLibFramework.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+\r
+\r
+extern EFI_COMPONENT_NAME_PROTOCOL  gGraphicsConsoleComponentName;\r
 \r
 //\r
-// Include common header file for this module.\r
+// EFI Component Name Functions\r
 //\r
-#include "CommonHeader.h"\r
+EFI_STATUS\r
+EFIAPI\r
+GraphicsConsoleComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
 \r
-#include "ComponentName.h"\r
+EFI_STATUS\r
+EFIAPI\r
+GraphicsConsoleComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
 \r
 //\r
 // Glyph database\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf
index 229f916db88cd2a2ff8a32adb1ca5b0727742398..24d401668705e4d7807cfab7396c6971d24a8774 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = GraphicsConsole\r
@@ -39,40 +34,16 @@
 #  COMPONENT_NAME                =  gGraphicsConsoleComponentName                \r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   ComponentName.c\r
-  ComponentName.h\r
   LaffStd.c\r
   GraphicsConsole.c\r
   GraphicsConsole.h\r
-  CommonHeader.h\r
-  EntryPoint.c\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec  \r
-\r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
+  # currently use Hii for glyph lookup, need to change to UEFI scheme\r
+  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
 \r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
@@ -83,24 +54,6 @@
   DebugLib\r
   HiiLib  \r
 \r
-\r
-################################################################################\r
-#\r
-# Guid C Name Section - list of Guids that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
-[Guids]\r
-  \r
-\r
-\r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
   gEfiSimpleTextOutProtocolGuid                 # PROTOCOL BY_START\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
index d91f91fd89034a0ead94b72b9267300c5cf05119..ac8dd168337e208e3926ead215f6787d2a9b22ba 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/LaffStd.c
@@ -20,11 +20,6 @@ Revision History
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "GraphicsConsole.h"\r
 \r
 EFI_NARROW_GLYPH  UsStdNarrowGlyphData[] = {\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/CommonHeader.h b/MdeModulePkg/Universal/Console/TerminalDxe/CommonHeader.h
deleted file mode 100644 (file)
index 7aca138..0000000
--- a/MdeModulePkg/Universal/Console/TerminalDxe/CommonHeader.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**@file\r
-  Common header file shared by all source files.\r
-\r
-  This file includes package header files, library classes and protocol, PPI & GUID definitions.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-#ifndef __COMMON_HEADER_H_\r
-#define __COMMON_HEADER_H_\r
-\r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiDxe.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Protocol/SimpleTextOut.h>\r
-#include <Protocol/SerialIo.h>\r
-#include <Guid/GlobalVariable.h>\r
-#include <Protocol/DevicePath.h>\r
-#include <Protocol/SimpleTextIn.h>\r
-#include <Guid/HotPlugDevice.h>\r
-#include <Guid/PcAnsi.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/UefiDriverEntryPoint.h>\r
-#include <Library/UefiLib.h>\r
-#include <Library/ReportStatusCodeLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/DevicePathLib.h>\r
-//\r
-// Driver Binding Externs\r
-//\r
-extern EFI_DRIVER_BINDING_PROTOCOL gTerminalDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL gTerminalComponentName;\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
index 9048326f5a5e5812df8c1b248cdd16a9b26a462e..5db13dc4fa7cef1eb9944d592b83ba69932dd9d0 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/ComponentName.c
@@ -17,12 +17,6 @@ Abstract:
 \r
 --*/\r
 \r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Terminal.h"\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/EntryPoint.c b/MdeModulePkg/Universal/Console/TerminalDxe/EntryPoint.c
deleted file mode 100644 (file)
index a8feebb..0000000
--- a/MdeModulePkg/Universal/Console/TerminalDxe/EntryPoint.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/**@file\r
-  Entry Point Source file.\r
-\r
-  This file contains the user entry point \r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
-   are licensed and made available under the terms and conditions of the BSD License\r
-   which accompanies this distribution. The full text of the license may be found at\r
-   http://opensource.org/licenses/bsd-license.php\r
-   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-**/\r
-\r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
-/**\r
-  The user Entry Point for module Terminal. The user code starts with this function.\r
-\r
-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
-  @param[in] SystemTable    A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS       The entry point is executed successfully.\r
-  @retval other             Some error occurs when executing this entry point.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-InitializeTerminal(\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS              Status;\r
-\r
-  //\r
-  // Install driver model protocol(s).\r
-  //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
-             ImageHandle,\r
-             SystemTable,\r
-             &gTerminalDriverBinding,\r
-             ImageHandle,\r
-             &gTerminalComponentName,\r
-             NULL,\r
-             NULL\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-\r
-  return Status;\r
-}\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index 01ab587bd69f25afee9537645cc1fa7b52f67d23..4860a4b21041a0cf220b77164a76ae97d4834567 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -20,15 +20,9 @@ Revision History:
 --*/\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
 \r
 #include "Terminal.h"\r
 \r
-#include "FrameworkDxe.h"\r
-\r
 //\r
 // Globals\r
 //\r
@@ -195,15 +189,6 @@ TerminalDriverBindingStart (
   if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
     return Status;\r
   }\r
-  //\r
-  // Report that the remote terminal is being enabled\r
-  //\r
-  DevicePath = ParentDevicePath;\r
-  REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
-    EFI_PROGRESS_CODE,\r
-    EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_ENABLE,\r
-    DevicePath\r
-    );\r
 \r
   //\r
   // Open the Serial I/O Protocol BY_DRIVER.  It might already be started.\r
@@ -584,7 +569,7 @@ ReportError:
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-    EFI_PERIPHERAL_LOCAL_CONSOLE | EFI_P_EC_CONTROLLER_ERROR,\r
+    PcdGet32 (PcdStatusCodeValueRemoteConsoleError),\r
     DevicePath\r
     );\r
 \r
@@ -672,14 +657,6 @@ TerminalDriverBindingStop (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-  //\r
-  // Report that the remote terminal is being disabled\r
-  //\r
-  REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
-    EFI_PROGRESS_CODE,\r
-    EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_DISABLE,\r
-    DevicePath\r
-    );\r
 \r
   //\r
   // Complete all outstanding transactions to Controller.\r
@@ -1192,3 +1169,41 @@ InitializeEfiKeyFiFo (
   //\r
   TerminalDevice->EfiKeyFiFo.Head = TerminalDevice->EfiKeyFiFo.Tail;\r
 }\r
+\r
+\r
+/**\r
+  The user Entry Point for module Terminal. The user code starts with this function.\r
+\r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] SystemTable    A pointer to the EFI System Table.\r
+  \r
+  @retval EFI_SUCCESS       The entry point is executed successfully.\r
+  @retval other             Some error occurs when executing this entry point.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+InitializeTerminal(\r
+  IN EFI_HANDLE           ImageHandle,\r
+  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  )\r
+{\r
+  EFI_STATUS              Status;\r
+\r
+  //\r
+  // Install driver model protocol(s).\r
+  //\r
+  Status = EfiLibInstallAllDriverProtocols (\r
+             ImageHandle,\r
+             SystemTable,\r
+             &gTerminalDriverBinding,\r
+             ImageHandle,\r
+             &gTerminalComponentName,\r
+             NULL,\r
+             NULL\r
+             );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+\r
+  return Status;\r
+}\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index 7ec24b3091351aed4a2dd90c0e936fb6fe41827f..5a7dc0e3e7d49607e3a688b279e5237727b963d3 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -23,10 +23,27 @@ Revision History
 #ifndef _TERMINAL_H\r
 #define _TERMINAL_H\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+\r
+#include <PiDxe.h>\r
+#include <Protocol/SimpleTextOut.h>\r
+#include <Protocol/SerialIo.h>\r
+#include <Guid/GlobalVariable.h>\r
+#include <Protocol/DevicePath.h>\r
+#include <Protocol/SimpleTextIn.h>\r
+#include <Guid/HotPlugDevice.h>\r
+#include <Guid/PcAnsi.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/PcdLib.h>\r
+\r
+\r
 \r
 #define RAW_FIFO_MAX_NUMBER 256\r
 #define FIFO_MAX_NUMBER     128\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf
index 358db9560616a90882ba4de05013e7a53b0cc640..a3add0c7e431dea90567e11cebd39b94c4c8b045 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Terminal\r
@@ -39,12 +34,6 @@
 #  COMPONENT_NAME                =  gTerminalComponentName                       \r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   ComponentName.c\r
   vtutf8.c\r
@@ -53,27 +42,9 @@
   TerminalConIn.c\r
   Terminal.c\r
   Terminal.h\r
-  CommonHeader.h\r
-  EntryPoint.c\r
-\r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec \r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
 \r
 [LibraryClasses]\r
   DevicePathLib\r
@@ -85,13 +56,7 @@
   UefiLib\r
   UefiDriverEntryPoint\r
   DebugLib\r
-\r
-\r
-################################################################################\r
-#\r
-# Guid C Name Section - list of Guids that this module uses or produces.\r
-#\r
-################################################################################\r
+  PcdLib\r
 \r
 [Guids]\r
   gEfiGlobalVariableGuid                        # SOMETIMES_CONSUMED L"ErrOutDev"\r
@@ -101,13 +66,6 @@
   gEfiPcAnsiGuid                                # SOMETIMES_CONSUMED\r
 \r
 \r
-################################################################################\r
-#\r
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names\r
-#                           that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Protocols]\r
   gEfiHotPlugDeviceGuid                         # PROTOCOL SOMETIMES_CONSUMED\r
   gEfiSerialIoProtocolGuid                      # PROTOCOL TO_START\r
@@ -115,3 +73,8 @@
   gEfiSimpleTextInProtocolGuid                  # PROTOCOL BY_START\r
   gEfiSimpleTextOutProtocolGuid                 # PROTOCOL BY_START\r
 \r
+[PcdsFixedAtBuild]\r
+  PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid\r
+  PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid\r
+  PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid\r
+  PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 952024b712e5947ed068578654d04a22ea82cc45..2d76e38c3342a6502526d151dcaa8b9505ec3a22 100644 (file)
--- 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.
 \r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Terminal.h"\r
 \r
-#include "FrameworkDxe.h"\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -60,7 +54,7 @@ TerminalConInReset (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET,\r
+    PcdGet32 (PcdStatusCodeValueRemoteConsoleReset),\r
     TerminalDevice->DevicePath\r
     );\r
 \r
@@ -76,7 +70,7 @@ TerminalConInReset (
   if (EFI_ERROR (Status)) {\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      EFI_PERIPHERAL_LOCAL_CONSOLE | EFI_P_EC_CONTROLLER_ERROR,\r
+      PcdGet32 (PcdStatusCodeValueRemoteConsoleError),\r
       TerminalDevice->DevicePath\r
       );\r
   }\r
@@ -313,7 +307,7 @@ TerminalConInCheckForKey (
       if (Status == EFI_DEVICE_ERROR) {\r
         REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
           EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-          EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR,\r
+          PcdGet32 (PcdStatusCodeValueRemoteConsoleInputError),\r
           TerminalDevice->DevicePath\r
           );\r
       }\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index b5a9f33e1407b870f01aff2a2c51f62b14b6f434..1931c2288638b1847ab8c1275ca3ffcd721618ef 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -19,15 +19,8 @@ Abstract:
 Revision History\r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Terminal.h"\r
 \r
-#include "FrameworkDxe.h"\r
-\r
 //\r
 // This list is used to define the valid extend chars.\r
 // It also provides a mapping from Unicode to PCANSI or\r
@@ -145,7 +138,7 @@ TerminalConOutReset (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_PROGRESS_CODE,\r
-      EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET,\r
+      PcdGet32 (PcdStatusCodeValueRemoteConsoleReset),\r
       TerminalDevice->DevicePath\r
       );\r
 \r
@@ -156,7 +149,7 @@ TerminalConOutReset (
       //\r
       REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
         EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-        EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR,\r
+        PcdGet32 (PcdStatusCodeValueRemoteConsoleError),\r
         TerminalDevice->DevicePath\r
         );\r
 \r
@@ -360,7 +353,7 @@ TerminalConOutOutputString (
 OutputError:\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-    EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR,\r
+    PcdGet32 (PcdStatusCodeValueRemoteConsoleOutputError),\r
     TerminalDevice->DevicePath\r
     );\r
 \r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/ansi.c b/MdeModulePkg/Universal/Console/TerminalDxe/ansi.c
index c3ebe245bfec0621612bb93c5abde2f73f7634ab..babc4bbedc8245466cfff79f6b0f714c4bb38679 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/ansi.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/ansi.c
@@ -20,11 +20,6 @@ Revision History
 --*/\r
 \r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Terminal.h"\r
 \r
 VOID\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/vtutf8.c b/MdeModulePkg/Universal/Console/TerminalDxe/vtutf8.c
index 72e0920c8aeeb9913eee6eae7b2e4d7268269403..648344a279c911c9b4669583eff5b376db19b64c 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/vtutf8.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/vtutf8.c
@@ -19,12 +19,6 @@ Abstract:
 Revision History\r
 --*/\r
 \r
-\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Terminal.h"\r
 \r
 VOID\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h b/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h
index c488c38e9e812f937d136d6eef5452b2d5a290c4..967f16068831e29fb8e72ce9ed0b5bb313ce9450 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h
+++ b/MdeModulePkg/Universal/PCD/Pei/CommonHeader.h
@@ -15,26 +15,6 @@
 #ifndef __COMMON_HEADER_H_\r
 #define __COMMON_HEADER_H_\r
 \r
-\r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiPei.h>\r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Ppi/ReadOnlyVariable.h>\r
-#include <Ppi/Pcd.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/PeimEntryPoint.h>\r
-#include <Library/BaseLib.h>\r
-#include <Library/HobLib.h>\r
-#include <Library/PeiServicesLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/PeiServicesTablePointerLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
+#error\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index b018e5a95de29f2765897a9f61414ca141cd0be2..daaba4b539615654c82be19f0a959ed28e081eb2 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -14,11 +14,6 @@ Module Name: Pcd.c
 \r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Service.h"\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 64c01458b54d266a5c6e9334b79b80e60528157e..450aa857f0911290cc2eb27091a2f28ced37341c 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -14,11 +14,6 @@
 #\r
 #**/\r
 \r
-################################################################################\r
-#\r
-# Defines Section - statements that will be processed to create a Makefile.\r
-#\r
-################################################################################\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PcdPeim\r
@@ -37,38 +32,15 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r
-################################################################################\r
-#\r
-# Sources Section - list of files that are required for the build to succeed.\r
-#\r
-################################################################################\r
-\r
 [Sources.common]\r
   Service.c\r
   Service.h\r
   Pcd.c\r
   CommonHeader.h\r
 \r
-\r
-################################################################################\r
-#\r
-# Package Dependency Section - list of Package files that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-\r
-\r
-################################################################################\r
-#\r
-# Library Class Section - list of Library Classes that are required for\r
-#                         this module.\r
-#\r
-################################################################################\r
 \r
 [LibraryClasses]\r
   BaseMemoryLib\r
@@ -80,36 +52,15 @@
   PeimEntryPoint\r
   DebugLib\r
 \r
-\r
-################################################################################\r
-#\r
-# Guid C Name Section - list of Guids that this module uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Guids]\r
   gPcdPeiCallbackFnTableHobGuid                 # ALWAYS_PRODUCED  Hob: GUID_EXTENSION\r
   gPcdDataBaseHobGuid                           # ALWAYS_PRODUCED  Hob: GUID_EXTENSION\r
 \r
 \r
-################################################################################\r
-#\r
-# PPI C Name Section - list of PPI and PPI Notify C Names that this module\r
-#                      uses or produces.\r
-#\r
-################################################################################\r
-\r
 [Ppis]\r
-  gEfiPeiReadOnlyVariablePpiGuid                # PPI ALWAYS_CONSUMED\r
+  gEfiPeiReadOnlyVariable2PpiGuid               # PPI ALWAYS_CONSUMED\r
   gPcdPpiGuid                                   # PPI ALWAYS_PRODUCED\r
 \r
-\r
-################################################################################\r
-#\r
-# Pcd FEATURE_FLAG - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r
 [PcdsFeatureFlag.common]\r
   PcdPeiPcdDatabaseSetEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
   PcdPeiPcdDatabaseGetSizeEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
@@ -117,25 +68,10 @@
   PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
   PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
-\r
-################################################################################\r
-#\r
-# Pcd FIXED_AT_BUILD - list of PCDs that this module is coded for.\r
-#\r
-################################################################################\r
-\r
 [PcdsFixedAtBuild.common]\r
   PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid\r
   PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid\r
 \r
-\r
-################################################################################\r
-#\r
-# Dependency Expression Section - list of Dependency expressions that are required for\r
-#                              this module.\r
-#\r
-################################################################################\r
-\r
 [Depex]\r
   TRUE\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index cb980daa39ca44f9caa226217643a4350f524989..16a5cc848928c48f91a51fbcbf39e6b5f205416d 100644 (file)
--- 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\r
 \r
 **/\r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
 \r
 #include "Service.h"\r
 \r
@@ -171,28 +167,28 @@ GetHiiVariable (
   UINTN      Size;\r
   EFI_STATUS Status;\r
   VOID       *Buffer;\r
-  EFI_PEI_READ_ONLY_VARIABLE_PPI *VariablePpi;\r
+  EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariablePpi;\r
 \r
-  Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);\r
+  Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &VariablePpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Size = 0;\r
-  Status = VariablePpi->PeiGetVariable (\r
-                          GetPeiServicesTablePointer (),\r
+  Status = VariablePpi->GetVariable (\r
+                          VariablePpi,\r
                           VariableName,\r
                           (EFI_GUID *) VariableGuid,\r
                           NULL,\r
                           &Size,\r
                           NULL\r
-                            );\r
+                          );\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
 \r
     Status = PeiServicesAllocatePool (Size, &Buffer);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
-    Status = VariablePpi->PeiGetVariable (\r
-                              GetPeiServicesTablePointer (),\r
+    Status = VariablePpi->GetVariable (\r
+                              VariablePpi,\r
                               (UINT16 *) VariableName,\r
                               (EFI_GUID *) VariableGuid,\r
                               NULL,\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 334c399436215f48c6d03ade00a1057a54356938..fcfdda30e3de3ff574d7a1add26ef80d822250a7 100644 (file)
--- 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\r
 #define _SERVICE_H\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiPei.h>\r
+#include <Ppi/ReadOnlyVariable2.h>\r
+#include <Ppi/Pcd.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/PeimEntryPoint.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/PeiServicesLib.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/PeiServicesTablePointerLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+\r
 \r
 //\r
 // Please make sure the PCD Serivce PEIM Version is consistent with\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index fc895cc812bc0b73828fd25f845242a343983333..5680f851277a847c30cfc2dc1a24ef45ea4cd4a9 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -196,7 +196,6 @@
 #\r
 ################################################################################\r
 [Protocols.common]\r
-\r
   gEfiBdsArchProtocolGuid        = { 0x665E3FF6, 0x46CC, 0x11D4, { 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
   gEfiCpuArchProtocolGuid        = { 0x26BACCB1, 0x6F42, 0x11D4, { 0xBC, 0xE7, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}\r
   gEfiMetronomeArchProtocolGuid  = { 0x26BACCB2, 0x6F42, 0x11D4, { 0xBC, 0xE7, 0x00, 0x80, 0xC7, 0x3C, 0x88, 0x81 }}\r
@@ -325,13 +324,16 @@
   PcdStatusCodeValueSetVirtualAddressMap|0x0000000e|gEfiMdePkgTokenSpaceGuid|UINT32|0x03101004      # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP\r
   PcdStatusCodeValueMemoryTestStarted|0x0000000f|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051006         # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST\r
   PcdStatusCodeValueUncorrectableMemoryError|0x00000010|gEfiMdePkgTokenSpaceGuid|UINT32|0x00051003  # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE\r
+  PcdStatusCodeValueRemoteConsoleError|0x00000011|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR\r
+  PcdStatusCodeValueRemoteConsoleReset|0x00000012|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET\r
+  PcdStatusCodeValueRemoteConsoleInputError|0x00000013|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR\r
+  PcdStatusCodeValueRemoteConsoleOutputError|0x00000014|gEfiMdePkgTokenSpaceGuid|UINT32|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR\r
 \r
 [PcdsPatchableInModule.common]\r
   PcdDebugPrintErrorLevel|0x00000006|gEfiMdePkgTokenSpaceGuid|UINT32|0x80000000\r
   PcdPciExpressBaseAddress|0x0000000a|gEfiMdePkgTokenSpaceGuid|UINT64|0xE0000000\r
   PcdFSBClock|0x0000000c|gEfiMdePkgTokenSpaceGuid|UINT32|200000000\r
 \r
-\r
 [PcdsFixedAtBuild.IPF]\r
   PcdIoBlockBaseAddressForIpf|0x0000000c|gEfiMdePkgTokenSpaceGuid|UINT64|0x0ffffc000000\r
 \r

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 0f51017f46c4748ac245cb3f12e80ff57e1dc868..c800333dc1363f7f92b925f047d9d1b17cf12ffc 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -21,11 +21,11 @@
 #\r
 ################################################################################\r
 [Defines]\r
-  PLATFORM_NAME                  = MdePkgAll\r
+  PLATFORM_NAME                  = Mde\r
   PLATFORM_GUID                  = 082F8BFC-0455-4859-AE3C-ECD64FB81642\r
   PLATFORM_VERSION               = 0.1\r
   DSC_SPECIFICATION              = 0x00010005\r
-  OUTPUT_DIRECTORY               = $(WORKSPACE)\Build/Mde\r
+  OUTPUT_DIRECTORY               = $(WORKSPACE)/Build/Mde\r
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 3efe8310b579721a07d4abbcede98f34d5498175..5443406cb86a9bd0fa8c6a5d94800d3dff96e869 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -26,7 +26,7 @@
   PLATFORM_GUID                  = EB216561-961F-47EE-9EF9-CA426EF547C2\r
   PLATFORM_VERSION               = 0.3\r
   DSC_SPECIFICATION              = 0x00010005\r
-  OUTPUT_DIRECTORY               = $(WORKSPACE)/Build/Nt32Platform\r
+  OUTPUT_DIRECTORY               = $(WORKSPACE)/Build/NT32\r
   SUPPORTED_ARCHITECTURES        = IA32\r
   BUILD_TARGETS                  = DEBUG\r
   SKUID_IDENTIFIER               = DEFAULT\r
@@ -276,6 +276,11 @@
   PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid|0x2000\r
   PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid|0x280000\r
   PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid|0x00c000\r
+  PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid|0x0005100   # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3\r
+  PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR\r
+  PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET\r
+  PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR\r
+  PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR\r
 \r
 [PcdsFeatureFlag.IA32]\r
   PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE\r