diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-07-09 20:26:25 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-10-27 12:50:33 +0100 |
| commit | 85836c2215498ff18746b3a7e85ed684cf2e119e (patch) | |
| tree | 1b774a8f00fda2e0ccc1939105e5f4f2c7c8abe3 /src/superio/smsc/sio1036 | |
| parent | 377fd754932922e8c907994ef3e4d8ab925c6132 (diff) | |
superio: Use 'pnp_devfn_t' over 'device_t' in romstage component
The romstage component of Super I/O support is in fact written around
passing a lower and upper half packed integer. We currently have two
typedef's for this, 'device_t' and 'pnp_devfn_t'. We wish to make use of
'pnp_devfn_t' over 'device_t' as 'device_t' changes it's typedef in the
ramstage context and so is really a conflicting definition. This helps
solve problems down the road to having the 'real' 'device_t' definition
usable in romstage later.
This follows on from the rational given in:
c2956e7 device/pci_early.c: Mixes up variants of a typedefs to 'u32'
Change-Id: Ia9f238ebb944f9fe7b274621ee0c09a6de288a76
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6231
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/superio/smsc/sio1036')
| -rw-r--r-- | src/superio/smsc/sio1036/sio1036.h | 2 | ||||
| -rw-r--r-- | src/superio/smsc/sio1036/sio1036_early_init.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/superio/smsc/sio1036/sio1036.h b/src/superio/smsc/sio1036/sio1036.h index fa52a1a5c8..ba7a9327fc 100644 --- a/src/superio/smsc/sio1036/sio1036.h +++ b/src/superio/smsc/sio1036/sio1036.h @@ -29,6 +29,6 @@ #include <arch/io.h> #include <stdint.h> -void sio1036_enable_serial(device_t dev, u16 iobase); +void sio1036_enable_serial(pnp_devfn_t dev, u16 iobase); #endif /* SUPERIO_SMSC_1306_H */ diff --git a/src/superio/smsc/sio1036/sio1036_early_init.c b/src/superio/smsc/sio1036/sio1036_early_init.c index 5f10230c84..b37e81b974 100644 --- a/src/superio/smsc/sio1036/sio1036_early_init.c +++ b/src/superio/smsc/sio1036/sio1036_early_init.c @@ -24,13 +24,13 @@ #include "sio1036.h" -static inline void sio1036_enter_conf_state(device_t dev) +static inline void sio1036_enter_conf_state(pnp_devfn_t dev) { unsigned port = dev >> 8; outb(0x55, port); } -static inline void sio1036_exit_conf_state(device_t dev) +static inline void sio1036_exit_conf_state(pnp_devfn_t dev) { unsigned port = dev >> 8; outb(0xaa, port); @@ -39,7 +39,7 @@ static inline void sio1036_exit_conf_state(device_t dev) /* Detect SMSC SIO1036 LPC Debug Card status */ static u8 detect_sio1036_chip(unsigned port) { - device_t dev = PNP_DEV(port, SIO1036_SP1); + pnp_devfn_t dev = PNP_DEV(port, SIO1036_SP1); unsigned data; sio1036_enter_conf_state (dev); @@ -56,7 +56,7 @@ static u8 detect_sio1036_chip(unsigned port) }; } -void sio1036_enable_serial(device_t dev, u16 iobase) +void sio1036_enable_serial(pnp_devfn_t dev, u16 iobase) { unsigned port = dev >> 8; |