GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci_ops.{c,h}: Don't hide pointers behind typedefs 

Change-Id: I7cf7c236f94314d7970b19063d73db788c8267e5
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/7227
Tested-by: build bot (Jenkins)
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Edward O'Callaghan 2014-10-29 03:04:40 +11:00 committed by Nico Huber
parent 9a817ef183
commit 016732fec9
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/device/pci_ops.c
View File

@ -34,7 +34,7 @@ const struct pci_bus_operations *pci_bus_default_ops(device_t dev)
#endif #endif
} }
static const struct pci_bus_operations *pci_bus_ops(struct bus *bus, device_t dev) static const struct pci_bus_operations *pci_bus_ops(struct bus *bus, struct device *dev)
{ {
const struct pci_bus_operations *bops; const struct pci_bus_operations *bops;
bops = NULL; bops = NULL;
@ -50,7 +50,7 @@ static const struct pci_bus_operations *pci_bus_ops(struct bus *bus, device_t de
* The only consumer of the return value of get_pbus() is pci_bus_ops(). * The only consumer of the return value of get_pbus() is pci_bus_ops().
* pci_bus_ops() can handle being passed NULL and auto-picks working ops. * pci_bus_ops() can handle being passed NULL and auto-picks working ops.
*/ */
static struct bus *get_pbus(device_t dev) static struct bus *get_pbus(struct device *dev)
{ {
struct bus *pbus = NULL; struct bus *pbus = NULL;
@ -82,42 +82,42 @@ static struct bus *get_pbus(device_t dev)
return pbus; return pbus;
} }
u8 pci_read_config8(device_t dev, unsigned int where) u8 pci_read_config8(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
return pci_bus_ops(pbus, dev)->read8(pbus, dev->bus->secondary, return pci_bus_ops(pbus, dev)->read8(pbus, dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
u16 pci_read_config16(device_t dev, unsigned int where) u16 pci_read_config16(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
return pci_bus_ops(pbus, dev)->read16(pbus, dev->bus->secondary, return pci_bus_ops(pbus, dev)->read16(pbus, dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
u32 pci_read_config32(device_t dev, unsigned int where) u32 pci_read_config32(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
return pci_bus_ops(pbus, dev)->read32(pbus, dev->bus->secondary, return pci_bus_ops(pbus, dev)->read32(pbus, dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
void pci_write_config8(device_t dev, unsigned int where, u8 val) void pci_write_config8(struct device *dev, unsigned int where, u8 val)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
pci_bus_ops(pbus, dev)->write8(pbus, dev->bus->secondary, pci_bus_ops(pbus, dev)->write8(pbus, dev->bus->secondary,
dev->path.pci.devfn, where, val); dev->path.pci.devfn, where, val);
} }
void pci_write_config16(device_t dev, unsigned int where, u16 val) void pci_write_config16(struct device *dev, unsigned int where, u16 val)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
pci_bus_ops(pbus, dev)->write16(pbus, dev->bus->secondary, pci_bus_ops(pbus, dev)->write16(pbus, dev->bus->secondary,
dev->path.pci.devfn, where, val); dev->path.pci.devfn, where, val);
} }
void pci_write_config32(device_t dev, unsigned int where, u32 val) void pci_write_config32(struct device *dev, unsigned int where, u32 val)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
pci_bus_ops(pbus, dev)->write32(pbus, dev->bus->secondary, pci_bus_ops(pbus, dev)->write32(pbus, dev->bus->secondary,
@ -125,42 +125,42 @@ void pci_write_config32(device_t dev, unsigned int where, u32 val)
} }
#if CONFIG_MMCONF_SUPPORT #if CONFIG_MMCONF_SUPPORT
u8 pci_mmio_read_config8(device_t dev, unsigned int where) u8 pci_mmio_read_config8(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
return pci_ops_mmconf.read8(pbus, dev->bus->secondary, return pci_ops_mmconf.read8(pbus, dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
u16 pci_mmio_read_config16(device_t dev, unsigned int where) u16 pci_mmio_read_config16(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
return pci_ops_mmconf.read16(pbus, dev->bus->secondary, return pci_ops_mmconf.read16(pbus, dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
u32 pci_mmio_read_config32(device_t dev, unsigned int where) u32 pci_mmio_read_config32(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
return pci_ops_mmconf.read32(pbus, dev->bus->secondary, return pci_ops_mmconf.read32(pbus, dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
void pci_mmio_write_config8(device_t dev, unsigned int where, u8 val) void pci_mmio_write_config8(struct device *dev, unsigned int where, u8 val)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
pci_ops_mmconf.write8(pbus, dev->bus->secondary, dev->path.pci.devfn, pci_ops_mmconf.write8(pbus, dev->bus->secondary, dev->path.pci.devfn,
where, val); where, val);
} }
void pci_mmio_write_config16(device_t dev, unsigned int where, u16 val) void pci_mmio_write_config16(struct device *dev, unsigned int where, u16 val)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
pci_ops_mmconf.write16(pbus, dev->bus->secondary, dev->path.pci.devfn, pci_ops_mmconf.write16(pbus, dev->bus->secondary, dev->path.pci.devfn,
where, val); where, val);
} }
void pci_mmio_write_config32(device_t dev, unsigned int where, u32 val) void pci_mmio_write_config32(struct device *dev, unsigned int where, u32 val)
{ {
struct bus *pbus = get_pbus(dev); struct bus *pbus = get_pbus(dev);
pci_ops_mmconf.write32(pbus, dev->bus->secondary, dev->path.pci.devfn, pci_ops_mmconf.write32(pbus, dev->bus->secondary, dev->path.pci.devfn,

24
src/include/device/pci_ops.h
View File

@ -6,20 +6,20 @@
#include <arch/pci_ops.h> #include <arch/pci_ops.h>
#ifndef __SIMPLE_DEVICE__ #ifndef __SIMPLE_DEVICE__
u8 pci_read_config8(device_t dev, unsigned int where); u8 pci_read_config8(struct device *dev, unsigned int where);
u16 pci_read_config16(device_t dev, unsigned int where); u16 pci_read_config16(struct device *dev, unsigned int where);
u32 pci_read_config32(device_t dev, unsigned int where); u32 pci_read_config32(struct device *dev, unsigned int where);
void pci_write_config8(device_t dev, unsigned int where, u8 val); void pci_write_config8(struct device *dev, unsigned int where, u8 val);
void pci_write_config16(device_t dev, unsigned int where, u16 val); void pci_write_config16(struct device *dev, unsigned int where, u16 val);
void pci_write_config32(device_t dev, unsigned int where, u32 val); void pci_write_config32(struct device *dev, unsigned int where, u32 val);
#if CONFIG_MMCONF_SUPPORT #if CONFIG_MMCONF_SUPPORT
u8 pci_mmio_read_config8(device_t dev, unsigned int where); u8 pci_mmio_read_config8(struct device *dev, unsigned int where);
u16 pci_mmio_read_config16(device_t dev, unsigned int where); u16 pci_mmio_read_config16(struct device *dev, unsigned int where);
u32 pci_mmio_read_config32(device_t dev, unsigned int where); u32 pci_mmio_read_config32(struct device *dev, unsigned int where);
void pci_mmio_write_config8(device_t dev, unsigned int where, u8 val); void pci_mmio_write_config8(struct device *dev, unsigned int where, u8 val);
void pci_mmio_write_config16(device_t dev, unsigned int where, u16 val); void pci_mmio_write_config16(struct device *dev, unsigned int where, u16 val);
void pci_mmio_write_config32(device_t dev, unsigned int where, u32 val); void pci_mmio_write_config32(struct device *dev, unsigned int where, u32 val);
#endif #endif
#endif #endif