Add DxAdd Dxe as postfix for devicepath driver

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

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 08b65d950cb82cfcd46ac15d8753f087841c6b5a..4a8307aa5c6e28162530936f02056792d74a1134 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -420,7 +420,7 @@
   $(WORKSPACE)/MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf\r
-  $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf\r
+  $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
deleted file mode 100644 (file)
index 8258846..0000000
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf
+++ /dev/null
@@ -1,72 +0,0 @@
-#/** @file\r
-# Component description file for Device Path Driver.\r
-#\r
-# This driver implement these three UEFI deveice path protocols (\r
-#  DevicePathUtilities, DevicePahtToText and DevicePathFromText) and install them.\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                      = DevicePath\r
-  FILE_GUID                      = 9B680FCE-AD6B-4F3A-B60B-F59899003443\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00090000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  ENTRY_POINT                    = DevicePathEntryPoint\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
-\r
-[Sources.common]\r
-  DevicePathUtilities.c\r
-  DevicePathToText.c\r
-  DevicePathFromText.c\r
-  DevicePath.h\r
-  DevicePath.c\r
-\r
-[Packages]\r
-  MdeModulePkg/MdeModulePkg.dec\r
-  MdePkg/MdePkg.dec\r
-\r
-[LibraryClasses]\r
-  PcdLib\r
-  DevicePathLib\r
-  UefiBootServicesTableLib\r
-  MemoryAllocationLib\r
-  BaseMemoryLib\r
-  BaseLib\r
-  UefiDriverEntryPoint\r
-  PrintLib\r
-  DebugLib\r
-\r
-[Guids]\r
-  gEfiVTUTF8Guid                                # ALWAYS_CONSUMED\r
-  gEfiVT100Guid                                 # ALWAYS_CONSUMED\r
-  gEfiVT100PlusGuid                             # ALWAYS_CONSUMED\r
-  gEfiPcAnsiGuid                                # ALWAYS_CONSUMED\r
-\r
-[Protocols]\r
-  gEfiDevicePathToTextProtocolGuid              # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiDevicePathFromTextProtocolGuid            # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiDevicePathUtilitiesProtocolGuid           # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiDebugPortProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
-\r
-[PcdsFeatureFlag.common]\r
-  PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid\r
-  PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid\r
-\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
new file mode 100644 (file)
index 0000000..15340b4
--- /dev/null
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
@@ -0,0 +1,72 @@
+#/** @file\r
+# Component description file for Device Path Driver.\r
+#\r
+# This driver implement these three UEFI deveice path protocols (\r
+#  DevicePathUtilities, DevicePahtToText and DevicePathFromText) and install them.\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                      = DevicePathDxe\r
+  FILE_GUID                      = 9B680FCE-AD6B-4F3A-B60B-F59899003443\r
+  MODULE_TYPE                    = DXE_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  EDK_RELEASE_VERSION            = 0x00090000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  ENTRY_POINT                    = DevicePathEntryPoint\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
+\r
+[Sources.common]\r
+  DevicePathUtilities.c\r
+  DevicePathToText.c\r
+  DevicePathFromText.c\r
+  DevicePath.h\r
+  DevicePath.c\r
+\r
+[Packages]\r
+  MdeModulePkg/MdeModulePkg.dec\r
+  MdePkg/MdePkg.dec\r
+\r
+[LibraryClasses]\r
+  PcdLib\r
+  DevicePathLib\r
+  UefiBootServicesTableLib\r
+  MemoryAllocationLib\r
+  BaseMemoryLib\r
+  BaseLib\r
+  UefiDriverEntryPoint\r
+  PrintLib\r
+  DebugLib\r
+\r
+[Guids]\r
+  gEfiVTUTF8Guid                                # ALWAYS_CONSUMED\r
+  gEfiVT100Guid                                 # ALWAYS_CONSUMED\r
+  gEfiVT100PlusGuid                             # ALWAYS_CONSUMED\r
+  gEfiPcAnsiGuid                                # ALWAYS_CONSUMED\r
+\r
+[Protocols]\r
+  gEfiDevicePathToTextProtocolGuid              # PROTOCOL ALWAYS_PRODUCED\r
+  gEfiDevicePathFromTextProtocolGuid            # PROTOCOL ALWAYS_PRODUCED\r
+  gEfiDevicePathUtilitiesProtocolGuid           # PROTOCOL ALWAYS_PRODUCED\r
+  gEfiDebugPortProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
+\r
+[PcdsFeatureFlag.common]\r
+  PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid\r
+  PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid\r
+\r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index a144624678035e82ec91a6328e77f1021ebaf179..5b7ed928b355a2b1c7f99b256dcb061e15ea39ba 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -405,7 +405,7 @@
   $(WORKSPACE)/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-  $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf\r
+  $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   $(WORKSPACE)/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index e3f0cfabc1e4fe51d550a0fb1f8f29fc5e149b9f..d4df4dd78407d9a67db09611a1789c1d66886b7e 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -156,7 +156,7 @@ INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.inf
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-INF  $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePath.inf\r
+INF  $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  $(WORKSPACE)/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf\r