Patch set updated for coreboot: PCI ops: Rename pcie_xx() to pci_mmio_xx()

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17530

-gerrit

commit fd6b0aa458d634247a3956e969ba6edd1e2f2f24
Author: Kyösti Mälkki 
Date:   Sun Oct 27 14:59:00 2013 +0200

PCI ops: Rename pcie_xx() to pci_mmio_xx()

Change-Id: I7fa65197b8165b9b0b74937f9ba455c48308da37
    Signed-off-by: Kyösti Mälkki 
---
 src/arch/x86/include/arch/pci_mmio_cfg.h | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/arch/x86/include/arch/pci_mmio_cfg.h b/src/arch/x86/include/arch/pci_mmio_cfg.h
index d3eff8f..8caff5a 100644
--- a/src/arch/x86/include/arch/pci_mmio_cfg.h
+++ b/src/arch/x86/include/arch/pci_mmio_cfg.h
@@ -22,7 +22,7 @@
 #define DEFAULT_PCIEXBAR	CONFIG_MMCONF_BASE_ADDRESS

static inline __attribute__ ((always_inline))
-u8 pcie_read_config8(pci_devfn_t dev, unsigned int where)
+u8 pci_mmio_read_config8(pci_devfn_t dev, unsigned int where)
 {
    void *addr;
    addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | where);
@@ -30,7 +30,7 @@ u8 pcie_read_config8(pci_devfn_t dev, unsigned int where)
 }

static inline __attribute__ ((always_inline))
-u16 pcie_read_config16(pci_devfn_t dev, unsigned int where)
+u16 pci_mmio_read_config16(pci_devfn_t dev, unsigned int where)
 {
    void *addr;
    addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | (where & ~1));
@@ -38,7 +38,7 @@ u16 pcie_read_config16(pci_devfn_t dev, unsigned int where)
 }

static inline __attribute__ ((always_inline))
-u32 pcie_read_config32(pci_devfn_t dev, unsigned int where)
+u32 pci_mmio_read_config32(pci_devfn_t dev, unsigned int where)
 {
    void *addr;
    addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | (where & ~3));
@@ -46,7 +46,7 @@ u32 pcie_read_config32(pci_devfn_t dev, unsigned int where)
 }

static inline __attribute__ ((always_inline))
-void pcie_write_config8(pci_devfn_t dev, unsigned int where, u8 value)
+void pci_mmio_write_config8(pci_devfn_t dev, unsigned int where, u8 value)
 {
    void *addr;
    addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | where);
@@ -54,7 +54,7 @@ void pcie_write_config8(pci_devfn_t dev, unsigned int where, u8 value)
 }

static inline __attribute__ ((always_inline))
-void pcie_write_config16(pci_devfn_t dev, unsigned int where, u16 value)
+void pci_mmio_write_config16(pci_devfn_t dev, unsigned int where, u16 value)
 {
    void *addr;
    addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | (where & ~1));
@@ -62,29 +62,21 @@ void pcie_write_config16(pci_devfn_t dev, unsigned int where, u16 value)
 }

static inline __attribute__ ((always_inline))
-void pcie_write_config32(pci_devfn_t dev, unsigned int where, u32 value)
+void pci_mmio_write_config32(pci_devfn_t dev, unsigned int where, u32 value)
 {
    void *addr;
    addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | (where & ~3));
    write32(addr, value);
 }

-#define pci_mmio_read_config8 	pcie_read_config8
-#define pci_mmio_read_config16	pcie_read_config16
-#define pci_mmio_read_config32	pcie_read_config32
-
-#define pci_mmio_write_config8 	pcie_write_config8
-#define pci_mmio_write_config16	pcie_write_config16
-#define pci_mmio_write_config32	pcie_write_config32
-
 #if CONFIG_MMCONF_SUPPORT_DEFAULT
-#define pci_read_config8 	pcie_read_config8
-#define pci_read_config16	pcie_read_config16
-#define pci_read_config32	pcie_read_config32
+#define pci_read_config8 	pci_mmio_read_config8
+#define pci_read_config16	pci_mmio_read_config16
+#define pci_read_config32	pci_mmio_read_config32

-#define pci_write_config8 	pcie_write_config8
-#define pci_write_config16	pcie_write_config16
-#define pci_write_config32	pcie_write_config32
+#define pci_write_config8 	pci_mmio_write_config8
+#define pci_write_config16	pci_mmio_write_config16
+#define pci_write_config32	pci_mmio_write_config32
 #endif

#endif /* CONFIG_MMCONF_SUPPORT */