diff options
Diffstat (limited to 'src/device')
-rw-r--r-- | src/device/pci_ops.c | 12 | ||||
-rw-r--r-- | src/device/pci_ops_mmconf.c | 21 |
2 files changed, 15 insertions, 18 deletions
diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c index 82c22a7428..de0bf631b1 100644 --- a/src/device/pci_ops.c +++ b/src/device/pci_ops.c @@ -70,41 +70,41 @@ static struct bus *get_pbus(struct device *dev) u8 pci_read_config8(struct device *dev, unsigned int where) { struct bus *pbus = get_pbus(dev); - return pci_bus_ops(pbus, dev)->read8(pbus, dev->bus->secondary, + return pci_bus_ops(pbus, dev)->read8(dev->bus->secondary, dev->path.pci.devfn, where); } u16 pci_read_config16(struct device *dev, unsigned int where) { struct bus *pbus = get_pbus(dev); - return pci_bus_ops(pbus, dev)->read16(pbus, dev->bus->secondary, + return pci_bus_ops(pbus, dev)->read16(dev->bus->secondary, dev->path.pci.devfn, where); } u32 pci_read_config32(struct device *dev, unsigned int where) { struct bus *pbus = get_pbus(dev); - return pci_bus_ops(pbus, dev)->read32(pbus, dev->bus->secondary, + return pci_bus_ops(pbus, dev)->read32(dev->bus->secondary, dev->path.pci.devfn, where); } void pci_write_config8(struct device *dev, unsigned int where, u8 val) { struct bus *pbus = get_pbus(dev); - pci_bus_ops(pbus, dev)->write8(pbus, dev->bus->secondary, + pci_bus_ops(pbus, dev)->write8(dev->bus->secondary, dev->path.pci.devfn, where, val); } void pci_write_config16(struct device *dev, unsigned int where, u16 val) { struct bus *pbus = get_pbus(dev); - pci_bus_ops(pbus, dev)->write16(pbus, dev->bus->secondary, + pci_bus_ops(pbus, dev)->write16(dev->bus->secondary, dev->path.pci.devfn, where, val); } void pci_write_config32(struct device *dev, unsigned int where, u32 val) { struct bus *pbus = get_pbus(dev); - pci_bus_ops(pbus, dev)->write32(pbus, dev->bus->secondary, + pci_bus_ops(pbus, dev)->write32(dev->bus->secondary, dev->path.pci.devfn, where, val); } diff --git a/src/device/pci_ops_mmconf.c b/src/device/pci_ops_mmconf.c index f321347fda..8b7b57452f 100644 --- a/src/device/pci_ops_mmconf.c +++ b/src/device/pci_ops_mmconf.c @@ -29,38 +29,35 @@ (((DEVFN) & 0xFF) << 12) |\ ((WHERE) & 0xFFF)) & ~MASK)) -static uint8_t pci_mmconf_read_config8(struct bus *pbus, int bus, int devfn, - int where) +static uint8_t pci_mmconf_read_config8(int bus, int devfn, int where) { return read8(PCI_MMIO_ADDR(bus, devfn, where, 0)); } -static uint16_t pci_mmconf_read_config16(struct bus *pbus, int bus, int devfn, - int where) +static uint16_t pci_mmconf_read_config16(int bus, int devfn, int where) { return read16(PCI_MMIO_ADDR(bus, devfn, where, 1)); } -static uint32_t pci_mmconf_read_config32(struct bus *pbus, int bus, int devfn, - int where) +static uint32_t pci_mmconf_read_config32(int bus, int devfn, int where) { return read32(PCI_MMIO_ADDR(bus, devfn, where, 3)); } -static void pci_mmconf_write_config8(struct bus *pbus, int bus, int devfn, - int where, uint8_t value) +static void pci_mmconf_write_config8(int bus, int devfn, int where, + uint8_t value) { write8(PCI_MMIO_ADDR(bus, devfn, where, 0), value); } -static void pci_mmconf_write_config16(struct bus *pbus, int bus, int devfn, - int where, uint16_t value) +static void pci_mmconf_write_config16(int bus, int devfn, int where, + uint16_t value) { write16(PCI_MMIO_ADDR(bus, devfn, where, 1), value); } -static void pci_mmconf_write_config32(struct bus *pbus, int bus, int devfn, - int where, uint32_t value) +static void pci_mmconf_write_config32(int bus, int devfn, int where, + uint32_t value) { write32(PCI_MMIO_ADDR(bus, devfn, where, 3), value); } |