Add DxAdd Dxe as postfix for Terminal driver

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3278 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 0b1d6fcafc3173aeb4189cf51148f641029eb718..08b65d950cb82cfcd46ac15d8753f087841c6b5a 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -422,7 +422,7 @@
   $(WORKSPACE)/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf\r
-  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf\r
+  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
   $(WORKSPACE)/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
   $(WORKSPACE)/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf
deleted file mode 100644 (file)
index a3add0c..0000000
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf
+++ /dev/null
@@ -1,80 +0,0 @@
-#/** @file\r
-# Component description file for Terminal module.\r
-#\r
-# This driver installs Simple Text In/Out protocol for terminal devices (serial devices or hotplug devices).\r
-# Copyright (c) 2006 - 2007, Intel Corporation\r
-#\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
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = Terminal\r
-  FILE_GUID                      = 9E863906-A40F-4875-977F-5B93FF237FC6\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  ENTRY_POINT                    = InitializeTerminal\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-#  DRIVER_BINDING                =  gTerminalDriverBinding                       \r
-#  COMPONENT_NAME                =  gTerminalComponentName                       \r
-#\r
-\r
-[Sources.common]\r
-  ComponentName.c\r
-  vtutf8.c\r
-  ansi.c\r
-  TerminalConOut.c\r
-  TerminalConIn.c\r
-  Terminal.c\r
-  Terminal.h\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-\r
-[LibraryClasses]\r
-  DevicePathLib\r
-  UefiRuntimeServicesTableLib\r
-  UefiBootServicesTableLib\r
-  MemoryAllocationLib\r
-  BaseMemoryLib\r
-  ReportStatusCodeLib\r
-  UefiLib\r
-  UefiDriverEntryPoint\r
-  DebugLib\r
-  PcdLib\r
-\r
-[Guids]\r
-  gEfiGlobalVariableGuid                        # SOMETIMES_CONSUMED L"ErrOutDev"\r
-  gEfiVTUTF8Guid                                # SOMETIMES_CONSUMED\r
-  gEfiVT100Guid                                 # SOMETIMES_CONSUMED\r
-  gEfiVT100PlusGuid                             # SOMETIMES_CONSUMED\r
-  gEfiPcAnsiGuid                                # SOMETIMES_CONSUMED\r
-\r
-\r
-[Protocols]\r
-  gEfiHotPlugDeviceGuid                         # PROTOCOL SOMETIMES_CONSUMED\r
-  gEfiSerialIoProtocolGuid                      # PROTOCOL TO_START\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
-  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/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
new file mode 100644 (file)
index 0000000..9368bf4
--- /dev/null
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -0,0 +1,80 @@
+#/** @file\r
+# Component description file for Terminal module.\r
+#\r
+# This driver installs Simple Text In/Out protocol for terminal devices (serial devices or hotplug devices).\r
+# Copyright (c) 2006 - 2007, Intel Corporation\r
+#\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
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = TerminalDxe\r
+  FILE_GUID                      = 9E863906-A40F-4875-977F-5B93FF237FC6\r
+  MODULE_TYPE                    = DXE_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  ENTRY_POINT                    = InitializeTerminal\r
+\r
+#\r
+# The following information is for reference only and not required by the build tools.\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#\r
+#  DRIVER_BINDING                =  gTerminalDriverBinding                       \r
+#  COMPONENT_NAME                =  gTerminalComponentName                       \r
+#\r
+\r
+[Sources.common]\r
+  ComponentName.c\r
+  vtutf8.c\r
+  ansi.c\r
+  TerminalConOut.c\r
+  TerminalConIn.c\r
+  Terminal.c\r
+  Terminal.h\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+\r
+[LibraryClasses]\r
+  DevicePathLib\r
+  UefiRuntimeServicesTableLib\r
+  UefiBootServicesTableLib\r
+  MemoryAllocationLib\r
+  BaseMemoryLib\r
+  ReportStatusCodeLib\r
+  UefiLib\r
+  UefiDriverEntryPoint\r
+  DebugLib\r
+  PcdLib\r
+\r
+[Guids]\r
+  gEfiGlobalVariableGuid                        # SOMETIMES_CONSUMED L"ErrOutDev"\r
+  gEfiVTUTF8Guid                                # SOMETIMES_CONSUMED\r
+  gEfiVT100Guid                                 # SOMETIMES_CONSUMED\r
+  gEfiVT100PlusGuid                             # SOMETIMES_CONSUMED\r
+  gEfiPcAnsiGuid                                # SOMETIMES_CONSUMED\r
+\r
+\r
+[Protocols]\r
+  gEfiHotPlugDeviceGuid                         # PROTOCOL SOMETIMES_CONSUMED\r
+  gEfiSerialIoProtocolGuid                      # PROTOCOL TO_START\r
+  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
+  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/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 134a32b2acb2b6ee334652192583d31e793add99..a144624678035e82ec91a6328e77f1021ebaf179 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -404,7 +404,7 @@
   $(WORKSPACE)/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf\r
-  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf\r
+  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d4e130c32168ae25d3c6cc337ed2a14aadde5a4d..e3f0cfabc1e4fe51d550a0fb1f8f29fc5e149b9f 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -155,7 +155,7 @@ INF  $(WORKSPACE)/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.inf
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf\r
-INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.inf\r
+INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r