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

pci_ops_conf: Indentation fixes

Browse Source 
Indentation fixes in src/arch/x86/lib/pci_ops_conf{1,2}.c

Change-Id: I56e8ff6d2ee3a0b871b40577e10c99dea4b3b1bd
Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Reviewed-on: http://review.coreboot.org/576
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Vikram Narayanan
2012-01-24 19:17:47 +05:30
committed by Stefan Reinauer
parent 26dd3616b8
commit 31b680bfb0
2 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/arch/x86/lib/pci_ops_conf1.c
View File

@@ -9,55 +9,63 @@
*/ */
#if CONFIG_PCI_IO_CFG_EXT == 0 #if CONFIG_PCI_IO_CFG_EXT == 0
#define CONFIG_CMD(bus,devfn, where) (0x80000000 | (bus << 16) | (devfn << 8) | (where & ~3)) #define CONFIG_CMD(bus,devfn, where) (0x80000000 | (bus << 16) | \
(devfn << 8) | (where & ~3))
#else #else
#define CONFIG_CMD(bus,devfn, where) (0x80000000 | (bus << 16) | (devfn << 8) | ((where & 0xff) & ~3) | ((where & 0xf00)<<16) ) #define CONFIG_CMD(bus,devfn, where) (0x80000000 | (bus << 16) | \
(devfn << 8) | ((where & 0xff) & ~3) |\
((where & 0xf00)<<16))
#endif #endif
static uint8_t pci_conf1_read_config8(struct bus *pbus, int bus, int devfn, int where) static uint8_t pci_conf1_read_config8(struct bus *pbus, int bus, int devfn,
int where)
{ {
outl(CONFIG_CMD(bus, devfn, where), 0xCF8); outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
return inb(0xCFC + (where & 3)); return inb(0xCFC + (where & 3));
} }
static uint16_t pci_conf1_read_config16(struct bus *pbus, int bus, int devfn, int where) static uint16_t pci_conf1_read_config16(struct bus *pbus, int bus, int devfn,
int where)
{ {
outl(CONFIG_CMD(bus, devfn, where), 0xCF8); outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
return inw(0xCFC + (where & 2)); return inw(0xCFC + (where & 2));
} }
static uint32_t pci_conf1_read_config32(struct bus *pbus, int bus, int devfn, int where) static uint32_t pci_conf1_read_config32(struct bus *pbus, int bus, int devfn,
int where)
{ {
outl(CONFIG_CMD(bus, devfn, where), 0xCF8); outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
return inl(0xCFC); return inl(0xCFC);
} }
static void pci_conf1_write_config8(struct bus *pbus, int bus, int devfn, int where, uint8_t value) 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(CONFIG_CMD(bus, devfn, where), 0xCF8);
outb(value, 0xCFC + (where & 3)); outb(value, 0xCFC + (where & 3));
} }
static void pci_conf1_write_config16(struct bus *pbus, int bus, int devfn, int where, uint16_t value) 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(CONFIG_CMD(bus, devfn, where), 0xCF8);
outw(value, 0xCFC + (where & 2)); outw(value, 0xCFC + (where & 2));
} }
static void pci_conf1_write_config32(struct bus *pbus, int bus, int devfn, int where, uint32_t value) 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(CONFIG_CMD(bus, devfn, where), 0xCF8);
outl(value, 0xCFC); outl(value, 0xCFC);
} }
#undef CONFIG_CMD #undef CONFIG_CMD
const struct pci_bus_operations pci_cf8_conf1 = const struct pci_bus_operations pci_cf8_conf1 = {
{ .read8 = pci_conf1_read_config8,
.read8 = pci_conf1_read_config8,
.read16 = pci_conf1_read_config16, .read16 = pci_conf1_read_config16,
.read32 = pci_conf1_read_config32, .read32 = pci_conf1_read_config32,
.write8 = pci_conf1_write_config8, .write8 = pci_conf1_write_config8,
.write16 = pci_conf1_write_config16, .write16 = pci_conf1_write_config16,
.write32 = pci_conf1_write_config32, .write32 = pci_conf1_write_config32,
}; };

26
src/arch/x86/lib/pci_ops_conf2.c
View File

@@ -12,7 +12,8 @@
#define FUNC(devfn) (((devfn & 7) << 1) | 0xf0) #define FUNC(devfn) (((devfn & 7) << 1) | 0xf0)
#define SET(bus,devfn) outb(FUNC(devfn), 0xCF8); outb(bus, 0xCFA); #define SET(bus,devfn) outb(FUNC(devfn), 0xCF8); outb(bus, 0xCFA);
static uint8_t pci_conf2_read_config8(struct bus *pbus, int bus, int devfn, int where) static uint8_t pci_conf2_read_config8(struct bus *pbus, int bus, int devfn,
int where)
{ {
uint8_t value; uint8_t value;
SET(bus, devfn); SET(bus, devfn);
@@ -21,7 +22,8 @@ static uint8_t pci_conf2_read_config8(struct bus *pbus, int bus, int devfn, int
return value; return value;
} }
static uint16_t pci_conf2_read_config16(struct bus *pbus, int bus, int devfn, int where) static uint16_t pci_conf2_read_config16(struct bus *pbus, int bus, int devfn,
int where)
{ {
uint16_t value; uint16_t value;
SET(bus, devfn); SET(bus, devfn);
@@ -30,7 +32,8 @@ static uint16_t pci_conf2_read_config16(struct bus *pbus, int bus, int devfn, in
return value; return value;
} }
static uint32_t pci_conf2_read_config32(struct bus *pbus, int bus, int devfn, int where) static uint32_t pci_conf2_read_config32(struct bus *pbus, int bus, int devfn,
int where)
{ {
uint32_t value; uint32_t value;
SET(bus, devfn); SET(bus, devfn);
@@ -39,21 +42,24 @@ static uint32_t pci_conf2_read_config32(struct bus *pbus, int bus, int devfn, in
return value; return value;
} }
static void pci_conf2_write_config8(struct bus *pbus, int bus, int devfn, int where, uint8_t value) static void pci_conf2_write_config8(struct bus *pbus, int bus, int devfn,
int where, uint8_t value)
{ {
SET(bus, devfn); SET(bus, devfn);
outb(value, IOADDR(devfn, where)); outb(value, IOADDR(devfn, where));
outb(0, 0xCF8); outb(0, 0xCF8);
} }
static void pci_conf2_write_config16(struct bus *pbus, int bus, int devfn, int where, uint16_t value) static void pci_conf2_write_config16(struct bus *pbus, int bus, int devfn,
int where, uint16_t value)
{ {
SET(bus, devfn); SET(bus, devfn);
outw(value, IOADDR(devfn, where)); outw(value, IOADDR(devfn, where));
outb(0, 0xCF8); outb(0, 0xCF8);
} }
static void pci_conf2_write_config32(struct bus *pbus, int bus, int devfn, int where, uint32_t value) static void pci_conf2_write_config32(struct bus *pbus, int bus, int devfn,
int where, uint32_t value)
{ {
SET(bus, devfn); SET(bus, devfn);
outl(value, IOADDR(devfn, where)); outl(value, IOADDR(devfn, where));
@@ -64,13 +70,11 @@ static void pci_conf2_write_config32(struct bus *pbus, int bus, int devfn, int w
#undef IOADDR #undef IOADDR
#undef FUNC #undef FUNC
const struct pci_bus_operations pci_cf8_conf2 = const struct pci_bus_operations pci_cf8_conf2 = {
{ .read8 = pci_conf2_read_config8,
.read8 = pci_conf2_read_config8,
.read16 = pci_conf2_read_config16, .read16 = pci_conf2_read_config16,
.read32 = pci_conf2_read_config32, .read32 = pci_conf2_read_config32,
.write8 = pci_conf2_write_config8, .write8 = pci_conf2_write_config8,
.write16 = pci_conf2_write_config16, .write16 = pci_conf2_write_config16,
.write32 = pci_conf2_write_config32, .write32 = pci_conf2_write_config32,
}; };