MdePkg UefiPciSegmentLibPciRootBridgeIo: Remove redundant dependency

[mirror_edk2.git] / MdePkg / Library / UefiPciSegmentLibPciRootBridgeIo / PciSegmentLib.h

diff --git a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.h b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.h
index 00129edea6bb405ee4e16f97115df9e8c5dcaac7..639902f3d39f307a30e139521f37c1a4085b2fbc 100644 (file)
--- a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.h
+++ b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.h
@@ -1,13 +1,13 @@
 /** @file\r
   Include file of PciSegmentPciRootBridgeIo Library.\r
 \r
-  Copyright (c) 2007 - 2008, Intel Corporation All rights\r
-  reserved. This program and the accompanying materials are\r
+  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of\r
   the BSD License which accompanies this distribution.  The full\r
   text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-  \r
+  http://opensource.org/licenses/bsd-license.php.\r
+\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
@@ -16,7 +16,6 @@
 #ifndef __DXE_PCI_SEGMENT_LIB__\r
 #define __DXE_PCI_SEGMENT_LIB__\r
 \r
-#include <PiDxe.h>\r
 \r
 #include <Protocol/PciRootBridgeIo.h>\r
 \r
@@ -37,23 +36,23 @@ typedef struct {
 \r
 /**\r
   Assert the validity of a PCI Segment address.\r
-  A valid PCI address should not contain 1's in bits 31:28\r
+  A valid PCI Segment address should not contain 1's in bits 28..31 and 48..63\r
 \r
   @param  A The address to validate.\r
   @param  M Additional bits to assert to be zero.\r
 \r
 **/\r
 #define ASSERT_INVALID_PCI_SEGMENT_ADDRESS(A,M) \\r
-  ASSERT (((A) & (0xf0000000 | (M))) == 0)\r
+  ASSERT (((A) & (0xffff0000f0000000ULL | (M))) == 0)\r
 \r
 /**\r
   Translate PCI Lib address into format of PCI Root Bridge I/O Protocol\r
 \r
-  @param  A  Address that encodes the PCI Bus, Device, Function and\r
+  @param  A  The address that encodes the PCI Bus, Device, Function and\r
              Register.\r
 \r
 **/\r
 #define PCI_TO_PCI_ROOT_BRIDGE_IO_ADDRESS(A) \\r
-  ((((A) << 4) & 0xff000000) | (((A) >> 4) & 0x00000700) | (((A) << 1) & 0x001f0000) | (LShiftU64((A) & 0xfff, 32)))\r
+  ((((UINT32)(A) << 4) & 0xff000000) | (((UINT32)(A) >> 4) & 0x00000700) | (((UINT32)(A) << 1) & 0x001f0000) | (LShiftU64((A) & 0xfff, 32)))\r
 \r
 #endif\r