diff options
| author | Antonello Dettori <dev@dettori.io> | 2016-08-30 22:05:32 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-09-13 17:22:07 +0200 |
| commit | 061d781e993b1fffd559a0af08cbb41a4a0675c7 (patch) | |
| tree | 56ec01a75fafeb75f0437fc579aa4a86af3b60b9 | |
| parent | 196e3d439ee14cdf102b88c162b2f2ed871f0205 (diff) | |
| download | coreboot-061d781e993b1fffd559a0af08cbb41a4a0675c7.tar.xz | |
southbridge/intel/i82801gx: transition away from device_t
Replace the use of the old device_t definition inside
southbridge/intel/i82801gx.
The patch has been tested both with the arch/io.h definition of device_t
enabled and disabled in order to ensure compatibility while the
transaction takes place.
Change-Id: Ia257318a7068b54739f319bfbba35f2a07826940
Signed-off-by: Antonello Dettori <dev@dettori.io>
Reviewed-on: https://review.coreboot.org/16370
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | src/southbridge/intel/i82801gx/early_smbus.c | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx.h | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801gx/smihandler.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/southbridge/intel/i82801gx/early_smbus.c b/src/southbridge/intel/i82801gx/early_smbus.c index 2f9cdeb060..47fe5f6a7c 100644 --- a/src/southbridge/intel/i82801gx/early_smbus.c +++ b/src/southbridge/intel/i82801gx/early_smbus.c @@ -23,7 +23,7 @@ void enable_smbus(void) { - device_t dev; + pci_devfn_t dev; /* Set the SMBus device statically. */ dev = PCI_DEV(0x0, 0x1f, 0x3); diff --git a/src/southbridge/intel/i82801gx/i82801gx.h b/src/southbridge/intel/i82801gx/i82801gx.h index d4adc182ca..7e8b988fbd 100644 --- a/src/southbridge/intel/i82801gx/i82801gx.h +++ b/src/southbridge/intel/i82801gx/i82801gx.h @@ -43,7 +43,9 @@ #if !defined(__ASSEMBLER__) #if !defined(__PRE_RAM__) #include "chip.h" -extern void i82801gx_enable(device_t dev); +#if !defined(__SIMPLE_DEVICE__) +void i82801gx_enable(device_t dev); +#endif void gpi_route_interrupt(u8 gpi, u8 mode); #else void enable_smbus(void); diff --git a/src/southbridge/intel/i82801gx/smihandler.c b/src/southbridge/intel/i82801gx/smihandler.c index d3867a5950..c6425dba51 100644 --- a/src/southbridge/intel/i82801gx/smihandler.c +++ b/src/southbridge/intel/i82801gx/smihandler.c @@ -276,7 +276,7 @@ static void busmaster_disable_on_bus(int bus) for (slot = 0; slot < 0x20; slot++) { for (func = 0; func < 8; func++) { u32 reg32; - device_t dev = PCI_DEV(bus, slot, func); + pci_devfn_t dev = PCI_DEV(bus, slot, func); val = pci_read_config32(dev, PCI_VENDOR_ID); |