Rename DxePciLibPciRootBridgeIo to UefiPciLibPciRootBridgeIo.

Rename DxePciSegmentLibPciRootBridgeIo to UefiPciSegmentLibPciRootBridgeIo.
Update MODULE_TYPE and BASE_NAME accordingly.

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

diff --git a/MdePkg/Library/UefiPciLibPciRootBridgeIo/DxePciLibPciRootBridgeIo.inf b/MdePkg/Library/UefiPciLibPciRootBridgeIo/DxePciLibPciRootBridgeIo.inf
deleted file mode 100644 (file)
index 9c6f35d..0000000
--- a/MdePkg/Library/UefiPciLibPciRootBridgeIo/DxePciLibPciRootBridgeIo.inf
+++ /dev/null
@@ -1,55 +0,0 @@
-# @file\r
-# PCI Library that layers on top of the PCI Root Bridge I/O Protocol.\r
-#\r
-# This library produces the APIs from the PCI Library and implements these APIs\r
-#  by calling into the PCI Root Bridge I/O Protocol. The PCI Root Bridge I/O Protocol is\r
-#  typically produced by a chipset specific DXE driver.\r
-#  This library binds to the first PCI Root Bridge I/O Protocol in the platform. As a result,\r
-#  it should only be used on platforms that contain a single PCI root bridge.\r
-#\r
-# Copyright (c) 2007 - 2008, 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                      = DxePciLibPciRootBridgeIo\r
-  FILE_GUID                      = 90EC42CB-B780-4eb8-8E99-C8E3E5F37530\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = PciLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  CONSTRUCTOR                    = PciLibConstructor\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
-  PciLib.c\r
-\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-\r
-\r
-[LibraryClasses]\r
-  BaseLib\r
-  UefiBootServicesTableLib\r
-  DebugLib\r
-\r
-[Protocols]\r
-  gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED\r
-\r

diff --git a/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf b/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
new file mode 100644 (file)
index 0000000..1aadc52
--- /dev/null
+++ b/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
@@ -0,0 +1,55 @@
+# @file\r
+# PCI Library that layers on top of the PCI Root Bridge I/O Protocol.\r
+#\r
+# This library produces the APIs from the PCI Library and implements these APIs\r
+#  by calling into the PCI Root Bridge I/O Protocol. The PCI Root Bridge I/O Protocol is\r
+#  typically produced by a chipset specific DXE driver.\r
+#  This library binds to the first PCI Root Bridge I/O Protocol in the platform. As a result,\r
+#  it should only be used on platforms that contain a single PCI root bridge.\r
+#\r
+# Copyright (c) 2007 - 2008, 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                      = UefiPciLibPciRootBridgeIo\r
+  FILE_GUID                      = 90EC42CB-B780-4eb8-8E99-C8E3E5F37530\r
+  MODULE_TYPE                    = UEFI_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = PciLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  CONSTRUCTOR                    = PciLibConstructor\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
+  PciLib.c\r
+\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+\r
+\r
+[LibraryClasses]\r
+  BaseLib\r
+  UefiBootServicesTableLib\r
+  DebugLib\r
+\r
+[Protocols]\r
+  gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED\r
+\r

diff --git a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/DxePciSegmentLibPciRootBridgeIo.inf b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/DxePciSegmentLibPciRootBridgeIo.inf
deleted file mode 100644 (file)
index abb442f..0000000
--- a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/DxePciSegmentLibPciRootBridgeIo.inf
+++ /dev/null
@@ -1,58 +0,0 @@
-# @file\r
-# PCI Segment Library that layers on top of the PCI Root Bridge I/O Protocol.\r
-#\r
-# This library produces the APIs from the PCI Library and implements these APIs\r
-#  by calling into the PCI Root Bridge I/O Protocols that are present in the platform.\r
-#  The PCI Root Bridge I/O Protocols are typically produced by a chipset specific DXE driver.\r
-#  This library binds to all of the PCI Root Bridge I/O Protocols in the platform and handles\r
-#  the translation from a PCI segment number into a specific PCI Root Bridge I/O Protocol.\r
-#\r
-# Copyright (c) 2007 - 2008, 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                      = DxePciSegmentLibPciRootBridgeIo\r
-  FILE_GUID                      = C6068612-B6E0-48a3-BB92-60E4A4F89EDF\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = PciSegmentLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-  CONSTRUCTOR                    = PciSegmentLibConstructor\r
-  DESTRUCTOR                     = PciSegmentLibDestructor\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
-  PciSegmentLib.h\r
-  PciSegmentLib.c\r
-\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-\r
-\r
-[LibraryClasses]\r
-  MemoryAllocationLib\r
-  BaseLib\r
-  UefiBootServicesTableLib\r
-  DebugLib\r
-\r
-[Protocols]\r
-  gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED\r
-\r

diff --git a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
new file mode 100644 (file)
index 0000000..ef544cd
--- /dev/null
+++ b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
@@ -0,0 +1,58 @@
+# @file\r
+# PCI Segment Library that layers on top of the PCI Root Bridge I/O Protocol.\r
+#\r
+# This library produces the APIs from the PCI Library and implements these APIs\r
+#  by calling into the PCI Root Bridge I/O Protocols that are present in the platform.\r
+#  The PCI Root Bridge I/O Protocols are typically produced by a chipset specific DXE driver.\r
+#  This library binds to all of the PCI Root Bridge I/O Protocols in the platform and handles\r
+#  the translation from a PCI segment number into a specific PCI Root Bridge I/O Protocol.\r
+#\r
+# Copyright (c) 2007 - 2008, 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                      = UefiPciSegmentLibPciRootBridgeIo\r
+  FILE_GUID                      = C6068612-B6E0-48a3-BB92-60E4A4F89EDF\r
+  MODULE_TYPE                    = UEFI_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = PciSegmentLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION\r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+  CONSTRUCTOR                    = PciSegmentLibConstructor\r
+  DESTRUCTOR                     = PciSegmentLibDestructor\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
+  PciSegmentLib.h\r
+  PciSegmentLib.c\r
+\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+\r
+\r
+[LibraryClasses]\r
+  MemoryAllocationLib\r
+  BaseLib\r
+  UefiBootServicesTableLib\r
+  DebugLib\r
+\r
+[Protocols]\r
+  gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED\r
+\r

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 7230251964a7a2195b17ab9244bcd5ceac8e923a..887be9f8052c9f0f759829b1bf45687946c9e16c 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -78,8 +78,6 @@
   MdePkg/Library/DxeServicesLib/DxeServicesLib.inf\r
   MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf\r
-  MdePkg/Library/DxePciLibPciRootBridgeIo/DxePciLibPciRootBridgeIo.inf\r
-  MdePkg/Library/DxePciSegmentLibPciRootBridgeIo/DxePciSegmentLibPciRootBridgeIo.inf\r
 \r
   MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf\r
   MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf\r
@@ -110,6 +108,8 @@
   MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
   MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
   MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
+  MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf\r
+  MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf\r
 \r
 [Components.IA32, Components.X64]\r
   MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r