summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/include/arch/io.h43
-rw-r--r--src/arch/x86/include/arch/pci_mmio_cfg.h21
2 files changed, 25 insertions, 39 deletions
diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h
index 69922e2a93..0d4be8662a 100644
--- a/src/arch/x86/include/arch/io.h
+++ b/src/arch/x86/include/arch/io.h
@@ -246,24 +246,6 @@ typedef u32 device_t;
#include <arch/pci_io_cfg.h>
#include <arch/pci_mmio_cfg.h>
-static inline __attribute__((always_inline))
-void pci_or_config8(pci_devfn_t dev, unsigned where, uint8_t value)
-{
- pci_write_config8(dev, where, pci_read_config8(dev, where) | value);
-}
-
-static inline __attribute__((always_inline))
-void pci_or_config16(pci_devfn_t dev, unsigned where, uint16_t value)
-{
- pci_write_config16(dev, where, pci_read_config16(dev, where) | value);
-}
-
-static inline __attribute__((always_inline))
-void pci_or_config32(pci_devfn_t dev, unsigned where, uint32_t value)
-{
- pci_write_config32(dev, where, pci_read_config32(dev, where) | value);
-}
-
#define PCI_DEV_INVALID (0xffffffffU)
static inline pci_devfn_t pci_io_locate_device(unsigned pci_id, pci_devfn_t dev)
{
@@ -367,4 +349,29 @@ void pnp_set_drq(pnp_devfn_t dev, unsigned index, unsigned drq)
#endif /* __SIMPLE_DEVICE__ */
+#ifndef __SIMPLE_DEVICE__
+#include <device/pci_ops.h>
+#endif
+
+static inline __attribute__ ((always_inline))
+void pci_or_config8(device_t dev, unsigned int where, u8 ormask)
+{
+ u8 value = pci_read_config8(dev, where);
+ pci_write_config8(dev, where, value | ormask);
+}
+
+static inline __attribute__ ((always_inline))
+void pci_or_config16(device_t dev, unsigned int where, u16 ormask)
+{
+ u16 value = pci_read_config16(dev, where);
+ pci_write_config16(dev, where, value | ormask);
+}
+
+static inline __attribute__ ((always_inline))
+void pci_or_config32(device_t dev, unsigned int where, u32 ormask)
+{
+ u32 value = pci_read_config32(dev, where);
+ pci_write_config32(dev, where, value | ormask);
+}
+
#endif
diff --git a/src/arch/x86/include/arch/pci_mmio_cfg.h b/src/arch/x86/include/arch/pci_mmio_cfg.h
index 25cdae9fee..d3eff8fab7 100644
--- a/src/arch/x86/include/arch/pci_mmio_cfg.h
+++ b/src/arch/x86/include/arch/pci_mmio_cfg.h
@@ -69,27 +69,6 @@ void pcie_write_config32(pci_devfn_t dev, unsigned int where, u32 value)
write32(addr, value);
}
-static inline __attribute__ ((always_inline))
-void pcie_or_config8(pci_devfn_t dev, unsigned int where, u8 ormask)
-{
- u8 value = pcie_read_config8(dev, where);
- pcie_write_config8(dev, where, value | ormask);
-}
-
-static inline __attribute__ ((always_inline))
-void pcie_or_config16(pci_devfn_t dev, unsigned int where, u16 ormask)
-{
- u16 value = pcie_read_config16(dev, where);
- pcie_write_config16(dev, where, value | ormask);
-}
-
-static inline __attribute__ ((always_inline))
-void pcie_or_config32(pci_devfn_t dev, unsigned int where, u32 ormask)
-{
- u32 value = pcie_read_config32(dev, where);
- pcie_write_config32(dev, where, value | ormask);
-}
-
#define pci_mmio_read_config8 pcie_read_config8
#define pci_mmio_read_config16 pcie_read_config16
#define pci_mmio_read_config32 pcie_read_config32