Rename EFI_PEI_PCI_CFG_PPI_IO to EFI_PEI_PCI_CFG2_PPI_IO to avoid collision with...

[mirror_edk2.git] / MdePkg / Include / Ppi / PciCfg2.h

diff --git a/MdePkg/Include/Ppi/PciCfg2.h b/MdePkg/Include/Ppi/PciCfg2.h
index ed3ba80231a10cf1697c4ba0d6bd393a4d2d6aca..989720234c0a8a58a4f698cc8bf934acba5245f6 100644 (file)
--- a/MdePkg/Include/Ppi/PciCfg2.h
+++ b/MdePkg/Include/Ppi/PciCfg2.h
@@ -1,16 +1,14 @@
 /** @file\r
   This file declares PciCfg PPI used to access PCI configuration space in PEI\r
 \r
 /** @file\r
   This file declares PciCfg PPI used to access PCI configuration space in PEI\r
 \r

-  Copyright (c) 2006 - 2007, Intel Corporation                                                         \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
+  Copyright (c) 2006 - 2007, Intel Corporation\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

 \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
-  Module Name:  PciCfg.h\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
   @par Revision Reference:\r
   This PPI is defined in PI\r
 \r
   @par Revision Reference:\r
   This PPI is defined in PI\r


@@ -63,10 +61,10 @@ typedef struct {
 \r
   @param  This            Pointer to local data for the interface.\r
 \r
 \r
   @param  This            Pointer to local data for the interface.\r
 \r

-  @param  Width           The width of the access. Enumerated in bytes. \r
+  @param  Width           The width of the access. Enumerated in bytes.\r

                           See EFI_PEI_PCI_CFG_PPI_WIDTH above.\r
 \r
                           See EFI_PEI_PCI_CFG_PPI_WIDTH above.\r
 \r

-  @param  Address         The physical address of the access. The format of \r
+  @param  Address         The physical address of the access. The format of\r

                           the address is described by EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS.\r
 \r
   @param  Buffer          A pointer to the buffer of data..\r
                           the address is described by EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS.\r
 \r
   @param  Buffer          A pointer to the buffer of data..\r


@@ -82,7 +80,7 @@ typedef struct {
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_PEI_PCI_CFG_PPI_IO) (\r
+(EFIAPI *EFI_PEI_PCI_CFG2_PPI_IO) (\r

   IN CONST  EFI_PEI_SERVICES          **PeiServices,\r
   IN CONST  EFI_PEI_PCI_CFG2_PPI      *This,\r
   IN CONST  EFI_PEI_PCI_CFG_PPI_WIDTH Width,\r
   IN CONST  EFI_PEI_SERVICES          **PeiServices,\r
   IN CONST  EFI_PEI_PCI_CFG2_PPI      *This,\r
   IN CONST  EFI_PEI_PCI_CFG_PPI_WIDTH Width,\r


@@ -94,7 +92,7 @@ EFI_STATUS
 /**\r
   PCI read-modify-write operation.\r
 \r
 /**\r
   PCI read-modify-write operation.\r
 \r

-  @param  PeiServices     An indirect pointer to the PEI Services Table \r
+  @param  PeiServices     An indirect pointer to the PEI Services Table\r

                           published by the PEI Foundation.\r
 \r
   @param  This            Pointer to local data for the interface.\r
                           published by the PEI Foundation.\r
 \r
   @param  This            Pointer to local data for the interface.\r


@@ -104,11 +102,11 @@ EFI_STATUS
 \r
   @param  Address         The physical address of the access.\r
 \r
 \r
   @param  Address         The physical address of the access.\r
 \r

-  @param  SetBits         Points to value to bitwise-OR with the read configuration value. \r
+  @param  SetBits         Points to value to bitwise-OR with the read configuration value.\r

 \r
                           The size of the value is determined by Width.\r
 \r
 \r
                           The size of the value is determined by Width.\r
 \r

-  @param  ClearBits       Points to the value to negate and bitwise-AND with the read configuration value. \r
+  @param  ClearBits       Points to the value to negate and bitwise-AND with the read configuration value.\r

                           The size of the value is determined by Width.\r
 \r
 \r
                           The size of the value is determined by Width.\r
 \r
 \r


@@ -116,13 +114,13 @@ EFI_STATUS
 \r
   @retval EFI_DEVICE_ERROR      There was a problem with the transaction.\r
 \r
 \r
   @retval EFI_DEVICE_ERROR      There was a problem with the transaction.\r
 \r

-  @retval EFI_DEVICE_NOT_READY  The device is not capable of supporting \r
+  @retval EFI_DEVICE_NOT_READY  The device is not capable of supporting\r

                                 the operation at this time.\r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r
                                 the operation at this time.\r
 \r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_PEI_PCI_CFG_PPI_RW) (\r
+(EFIAPI *EFI_PEI_PCI_CFG2_PPI_RW) (\r

   IN CONST  EFI_PEI_SERVICES          **PeiServices,\r
   IN CONST  EFI_PEI_PCI_CFG2_PPI      *This,\r
   IN CONST  EFI_PEI_PCI_CFG_PPI_WIDTH Width,\r
   IN CONST  EFI_PEI_SERVICES          **PeiServices,\r
   IN CONST  EFI_PEI_PCI_CFG2_PPI      *This,\r
   IN CONST  EFI_PEI_PCI_CFG_PPI_WIDTH Width,\r


@@ -133,7 +131,7 @@ EFI_STATUS
 \r
 /**\r
   @par Ppi Description:\r
 \r
 /**\r
   @par Ppi Description:\r

-  The EFI_PEI_PCI_CFG_PPI interfaces are used to abstract accesses to PCI \r
+  The EFI_PEI_PCI_CFG_PPI interfaces are used to abstract accesses to PCI\r

   controllers behind a PCI root bridge controller.\r
 \r
   @param Read     PCI read services.  See the Read() function description.\r
   controllers behind a PCI root bridge controller.\r
 \r
   @param Read     PCI read services.  See the Read() function description.\r


@@ -146,9 +144,9 @@ EFI_STATUS
 \r
 **/\r
 struct _EFI_PEI_PCI_CFG2_PPI {\r
 \r
 **/\r
 struct _EFI_PEI_PCI_CFG2_PPI {\r

-  EFI_PEI_PCI_CFG_PPI_IO  Read;\r
-  EFI_PEI_PCI_CFG_PPI_IO  Write;\r
-  EFI_PEI_PCI_CFG_PPI_RW  Modify;\r
+  EFI_PEI_PCI_CFG2_PPI_IO  Read;\r
+  EFI_PEI_PCI_CFG2_PPI_IO  Write;\r
+  EFI_PEI_PCI_CFG2_PPI_RW  Modify;\r

   UINT16                  Segment;\r
 };\r
 \r
   UINT16                  Segment;\r
 };\r
 \r