summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/pci_ops_conf1.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/arch/x86/pci_ops_conf1.c b/src/arch/x86/pci_ops_conf1.c
index 30cbcb46f1..e088463eeb 100644
--- a/src/arch/x86/pci_ops_conf1.c
+++ b/src/arch/x86/pci_ops_conf1.c
@@ -19,10 +19,10 @@
*/
#if !IS_ENABLED(CONFIG_PCI_IO_CFG_EXT)
-#define CONFIG_CMD(bus, devfn, where) (0x80000000 | (bus << 16) | \
+#define CONF_CMD(bus, devfn, where) (0x80000000 | (bus << 16) | \
(devfn << 8) | (where & ~3))
#else
-#define CONFIG_CMD(bus, devfn, where) (0x80000000 | (bus << 16) | \
+#define CONF_CMD(bus, devfn, where) (0x80000000 | (bus << 16) | \
(devfn << 8) | ((where & 0xff) & ~3) |\
((where & 0xf00)<<16))
#endif
@@ -30,46 +30,46 @@
static uint8_t pci_conf1_read_config8(struct bus *pbus, int bus, int devfn,
int where)
{
- outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+ outl(CONF_CMD(bus, devfn, where), 0xCF8);
return inb(0xCFC + (where & 3));
}
static uint16_t pci_conf1_read_config16(struct bus *pbus, int bus, int devfn,
int where)
{
- outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+ outl(CONF_CMD(bus, devfn, where), 0xCF8);
return inw(0xCFC + (where & 2));
}
static uint32_t pci_conf1_read_config32(struct bus *pbus, int bus, int devfn,
int where)
{
- outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+ outl(CONF_CMD(bus, devfn, where), 0xCF8);
return inl(0xCFC);
}
static void pci_conf1_write_config8(struct bus *pbus, int bus, int devfn,
int where, uint8_t value)
{
- outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+ outl(CONF_CMD(bus, devfn, where), 0xCF8);
outb(value, 0xCFC + (where & 3));
}
static void pci_conf1_write_config16(struct bus *pbus, int bus, int devfn,
int where, uint16_t value)
{
- outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+ outl(CONF_CMD(bus, devfn, where), 0xCF8);
outw(value, 0xCFC + (where & 2));
}
static void pci_conf1_write_config32(struct bus *pbus, int bus, int devfn,
int where, uint32_t value)
{
- outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+ outl(CONF_CMD(bus, devfn, where), 0xCF8);
outl(value, 0xCFC);
}
-#undef CONFIG_CMD
+#undef CONF_CMD
const struct pci_bus_operations pci_cf8_conf1 = {
.read8 = pci_conf1_read_config8,