MdePkg/DxeIoLibCpuIo2: Add new Fifo routines in IoLib class

[mirror_edk2.git] / MdeModulePkg / Library / PiDxeS3BootScriptLib / InternalBootScriptLib.h

diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h b/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
index 9b150480dbcabb7fd5e6c2b18bbc59887e185f05..ffbf5d2688daf004b2283e7d11d55850c0756881 100644 (file)
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
+++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/InternalBootScriptLib.h
@@ -2,7 +2,7 @@
   Support for S3 boot script lib. This file defined some internal macro and internal\r
   data structure\r
 \r
-  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions\r
@@ -33,7 +33,7 @@
 #include <Library/PcdLib.h>\r
 #include <Library/SmbusLib.h>\r
 #include <Library/IoLib.h>\r
-#include <Library/PciLib.h>\r
+#include <Library/PciSegmentLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/TimerLib.h>\r
@@ -45,13 +45,15 @@
 #define MAX_IO_ADDRESS 0xFFFF\r
 \r
 //\r
-// Macro to convert a UEFI PCI address to a PCI Library PCI address\r
+// Macro to convert a UEFI PCI address + segment to a PCI Segment Library PCI address\r
 //\r
-#define PCI_ADDRESS_ENCODE(A) (UINTN)PCI_LIB_ADDRESS( \\r
-        ((((UINTN)(A))& 0xff000000) >> 24), ((((UINTN)(A)) &0x00ff0000) >> 16), ((((UINTN)(A)) & 0xff00) >> 8), ((RShiftU64 ((A), 32) & 0xfff) | ((A)& 0xff)) \\r
-        )\r
-\r
-\r
+#define PCI_ADDRESS_ENCODE(S, A) PCI_SEGMENT_LIB_ADDRESS( \\r
+                                   S, \\r
+                                   ((((UINTN)(A)) & 0xff000000) >> 24), \\r
+                                   ((((UINTN)(A)) & 0x00ff0000) >> 16), \\r
+                                   ((((UINTN)(A)) & 0xff00) >> 8), \\r
+                                   ((RShiftU64 ((A), 32) & 0xfff) | ((A) & 0xff)) \\r
+                                   )\r
 \r
 typedef union {\r
   UINT8 volatile  *Buf;\r