MdePkg/Include/Protocol/Tls.h: pack structures from the TLS RFC

[mirror_edk2.git] / MdePkg / Include / Protocol / PciIo.h

diff --git a/MdePkg/Include/Protocol/PciIo.h b/MdePkg/Include/Protocol/PciIo.h
index e1896bf29663f0aa4f2c86bad9f2530c0c425167..d6492fcf04364ce090f07eb8dd511a97c1654ae6 100644 (file)
--- a/MdePkg/Include/Protocol/PciIo.h
+++ b/MdePkg/Include/Protocol/PciIo.h
@@ -2,7 +2,7 @@
   EFI PCI I/O Protocol provides the basic Memory, I/O, PCI configuration, \r
   and DMA interfaces that a driver uses to access its PCI controller.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
   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
@@ -70,7 +70,7 @@ typedef enum {
 #define EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE   0x8000  ///< Clear for PCI controllers that can not genrate a DAC\r
 #define EFI_PCI_IO_ATTRIBUTE_ISA_IO_16            0x10000 ///< I/O cycles 0x0100-0x03FF or greater (16 bit decode)\r
 #define EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16    0x20000 ///< I/O cycles 0x3C6, 0x3C8, 0x3C9 (16 bit decode)\r
-#define EFI_PCI_IO_ATTRIBUTE_VGA_IO_16            0x30000 ///< I/O cycles 0x3B0-0x3BB and 0x3C0-0x3DF (16 bit decode)\r
+#define EFI_PCI_IO_ATTRIBUTE_VGA_IO_16            0x40000 ///< I/O cycles 0x3B0-0x3BB and 0x3C0-0x3DF (16 bit decode)\r
 \r
 #define EFI_PCI_DEVICE_ENABLE                     (EFI_PCI_IO_ATTRIBUTE_IO | EFI_PCI_IO_ATTRIBUTE_MEMORY | EFI_PCI_IO_ATTRIBUTE_BUS_MASTER)\r
 #define EFI_VGA_DEVICE_ENABLE                     (EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_IO)\r
@@ -331,7 +331,7 @@ EFI_STATUS
 \r
 /**                                                                 \r
   Allocates pages that are suitable for an EfiPciIoOperationBusMasterCommonBuffer\r
-  mapping.                                                                       \r
+  or EfiPciOperationBusMasterCommonBuffer64 mapping.\r
             \r
   @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
   @param  Type                  This parameter is not used and must be ignored.\r
@@ -344,7 +344,7 @@ EFI_STATUS
                                   \r
   @retval EFI_SUCCESS           The requested memory pages were allocated.\r
   @retval EFI_UNSUPPORTED       Attributes is unsupported. The only legal attribute bits are\r
-                                MEMORY_WRITE_COMBINE and MEMORY_CACHED.                     \r
+                                MEMORY_WRITE_COMBINE, MEMORY_CACHED and DUAL_ADDRESS_CYCLE.\r
   @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r
   @retval EFI_OUT_OF_RESOURCES  The memory pages could not be allocated.  \r
                                    \r
@@ -448,27 +448,26 @@ EFI_STATUS
   OUT UINT64                                   *Result OPTIONAL\r
   );\r
 \r
-/**                                                                 \r
+/**\r
   Gets the attributes that this PCI controller supports setting on a BAR using\r
   SetBarAttributes(), and retrieves the list of resource descriptors for a BAR.\r
-            \r
-  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.  \r
+\r
+  @param  This                  A pointer to the EFI_PCI_IO_PROTOCOL instance.\r
   @param  BarIndex              The BAR index of the standard PCI Configuration header to use as the\r
                                 base address for resource range. The legal range for this field is 0..5.\r
   @param  Supports              A pointer to the mask of attributes that this PCI controller supports\r
-                                setting for this BAR with SetBarAttributes().                        \r
-  @param  Resources             A pointer to the ACPI 2.0 resource descriptors that describe the current\r
-                                configuration of this BAR of the PCI controller.                        \r
+                                setting for this BAR with SetBarAttributes().\r
+  @param  Resources             A pointer to the resource descriptors that describe the current\r
+                                configuration of this BAR of the PCI controller.\r
                                   \r
-  @retval EFI_SUCCESS           If Supports is not NULL, then the attributes that the PCI       \r
-                                controller supports are returned in Supports. If Resources      \r
-                                is not NULL, then the ACPI 2.0 resource descriptors that the PCI\r
-                                controller is currently using are returned in Resources.          \r
+  @retval EFI_SUCCESS           If Supports is not NULL, then the attributes that the PCI\r
+                                controller supports are returned in Supports. If Resources\r
+                                is not NULL, then the resource descriptors that the PCI\r
+                                controller is currently using are returned in Resources.\r
   @retval EFI_INVALID_PARAMETER Both Supports and Attributes are NULL.\r
   @retval EFI_UNSUPPORTED       BarIndex not valid for this PCI controller.\r
   @retval EFI_OUT_OF_RESOURCES  There are not enough resources available to allocate\r
-                                Resources.                                                 \r
-                                \r
+                                Resources.\r
 **/\r
 typedef\r
 EFI_STATUS\r