sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device/pci_ops: Unify signatures

Browse Source 
Use fixed width types and const pointers for dev.

Change-Id: Ide3b70238479ad3e1869ed22aa4fa0f1ff8aa766
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31845
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Kyösti Mälkki
2019-03-07 11:13:29 +02:00
parent e5869f8ae0
commit 5517246a0d
6 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/arch/x86/include/arch/pci_io_cfg.h
View File

@@ -19,7 +19,7 @@
#include <device/pci_type.h>
static __always_inline
unsigned int pci_io_encode_addr(pci_devfn_t dev, unsigned int where)
uint32_t pci_io_encode_addr(pci_devfn_t dev, uint16_t where)
{
if (CONFIG(PCI_IO_CFG_EXT)) {
// seg == 0
@@ -30,49 +30,49 @@ unsigned int pci_io_encode_addr(pci_devfn_t dev, unsigned int where)
}
static __always_inline
uint8_t pci_io_read_config8(pci_devfn_t dev, unsigned int where)
uint8_t pci_io_read_config8(pci_devfn_t dev, uint16_t where)
{
unsigned int addr = pci_io_encode_addr(dev, where);
uint32_t addr = pci_io_encode_addr(dev, where);
outl(0x80000000 | (addr & ~3), 0xCF8);
return inb(0xCFC + (addr & 3));
}
static __always_inline
uint16_t pci_io_read_config16(pci_devfn_t dev, unsigned int where)
uint16_t pci_io_read_config16(pci_devfn_t dev, uint16_t where)
{
unsigned int addr = pci_io_encode_addr(dev, where);
uint32_t addr = pci_io_encode_addr(dev, where);
outl(0x80000000 | (addr & ~3), 0xCF8);
return inw(0xCFC + (addr & 2));
}
static __always_inline
uint32_t pci_io_read_config32(pci_devfn_t dev, unsigned int where)
uint32_t pci_io_read_config32(pci_devfn_t dev, uint16_t where)
{
unsigned int addr = pci_io_encode_addr(dev, where);
uint32_t addr = pci_io_encode_addr(dev, where);
outl(0x80000000 | (addr & ~3), 0xCF8);
return inl(0xCFC);
}
static __always_inline
void pci_io_write_config8(pci_devfn_t dev, unsigned int where, uint8_t value)
void pci_io_write_config8(pci_devfn_t dev, uint16_t where, uint8_t value)
{
unsigned int addr = pci_io_encode_addr(dev, where);
uint32_t addr = pci_io_encode_addr(dev, where);
outl(0x80000000 | (addr & ~3), 0xCF8);
outb(value, 0xCFC + (addr & 3));
}
static __always_inline
void pci_io_write_config16(pci_devfn_t dev, unsigned int where, uint16_t value)
void pci_io_write_config16(pci_devfn_t dev, uint16_t where, uint16_t value)
{
unsigned int addr = pci_io_encode_addr(dev, where);
uint32_t addr = pci_io_encode_addr(dev, where);
outl(0x80000000 | (addr & ~3), 0xCF8);
outw(value, 0xCFC + (addr & 2));
}
static __always_inline
void pci_io_write_config32(pci_devfn_t dev, unsigned int where, uint32_t value)
void pci_io_write_config32(pci_devfn_t dev, uint16_t where, uint32_t value)
{
unsigned int addr = pci_io_encode_addr(dev, where);
uint32_t addr = pci_io_encode_addr(dev, where);
outl(0x80000000 | (addr & ~3), 0xCF8);
outl(value, 0xCFC);
}
@@ -85,37 +85,37 @@ void pci_io_write_config32(pci_devfn_t dev, unsigned int where, uint32_t value)
*/
static __always_inline
uint8_t pci_s_read_config8(pci_devfn_t dev, unsigned int where)
uint8_t pci_s_read_config8(pci_devfn_t dev, uint16_t where)
{
return pci_io_read_config8(dev, where);
}
static __always_inline
uint16_t pci_s_read_config16(pci_devfn_t dev, unsigned int where)
uint16_t pci_s_read_config16(pci_devfn_t dev, uint16_t where)
{
return pci_io_read_config16(dev, where);
}
static __always_inline
uint32_t pci_s_read_config32(pci_devfn_t dev, unsigned int where)
uint32_t pci_s_read_config32(pci_devfn_t dev, uint16_t where)
{
return pci_io_read_config32(dev, where);
}
static __always_inline
void pci_s_write_config8(pci_devfn_t dev, unsigned int where, uint8_t value)
void pci_s_write_config8(pci_devfn_t dev, uint16_t where, uint8_t value)
{
pci_io_write_config8(dev, where, value);
}
static __always_inline
void pci_s_write_config16(pci_devfn_t dev, unsigned int where, uint16_t value)
void pci_s_write_config16(pci_devfn_t dev, uint16_t where, uint16_t value)
{
pci_io_write_config16(dev, where, value);
}
static __always_inline
void pci_s_write_config32(pci_devfn_t dev, unsigned int where, uint32_t value)
void pci_s_write_config32(pci_devfn_t dev, uint16_t where, uint32_t value)
{
pci_io_write_config32(dev, where, value);
}

12
src/arch/x86/pci_ops_conf1.c
View File

@@ -27,39 +27,39 @@
((where & 0xf00)<<16))
#endif
static uint8_t pci_conf1_read_config8(struct device *dev, int where)
static uint8_t pci_conf1_read_config8(const struct device *dev, uint16_t where)
{
outl(CONF_CMD(dev, where), 0xCF8);
return inb(0xCFC + (where & 3));
}
static uint16_t pci_conf1_read_config16(struct device *dev, int where)
static uint16_t pci_conf1_read_config16(const struct device *dev, uint16_t where)
{
outl(CONF_CMD(dev, where), 0xCF8);
return inw(0xCFC + (where & 2));
}
static uint32_t pci_conf1_read_config32(struct device *dev, int where)
static uint32_t pci_conf1_read_config32(const struct device *dev, uint16_t where)
{
outl(CONF_CMD(dev, where), 0xCF8);
return inl(0xCFC);
}
static void pci_conf1_write_config8(struct device *dev, int where,
static void pci_conf1_write_config8(const struct device *dev, uint16_t where,
uint8_t value)
{
outl(CONF_CMD(dev, where), 0xCF8);
outb(value, 0xCFC + (where & 3));
}
static void pci_conf1_write_config16(struct device *dev, int where,
static void pci_conf1_write_config16(const struct device *dev, uint16_t where,
uint16_t value)
{
outl(CONF_CMD(dev, where), 0xCF8);
outw(value, 0xCFC + (where & 2));
}
static void pci_conf1_write_config32(struct device *dev, int where,
static void pci_conf1_write_config32(const struct device *dev, uint16_t where,
uint32_t value)
{
outl(CONF_CMD(dev, where), 0xCF8);