diff options
| author | Michael Brown <mcb30@ipxe.org> | 2011-02-09 00:32:58 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2011-02-17 01:25:11 +0000 |
| commit | f9b3fae8d46a6b1862b3f5b02490e5a8c224286f (patch) | |
| tree | 1862f41cd2b7ab031780881ed953acc647d38114 /src/arch/x86/core/pcidirect.c | |
| parent | 00f5ba701fe1e43a28a15c5ffc626ce671ec65cb (diff) | |
| download | ipxe-f9b3fae8d46a6b1862b3f5b02490e5a8c224286f.zip ipxe-f9b3fae8d46a6b1862b3f5b02490e5a8c224286f.tar.gz ipxe-f9b3fae8d46a6b1862b3f5b02490e5a8c224286f.tar.bz2 | |
[pci] Use single "busdevfn" field in struct pci_device
Merge the "bus" and "devfn" fields into a single "busdevfn" field, to
match the format used by the majority of external code.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/x86/core/pcidirect.c')
| -rw-r--r-- | src/arch/x86/core/pcidirect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/x86/core/pcidirect.c b/src/arch/x86/core/pcidirect.c index 38e056d..ae74b7f 100644 --- a/src/arch/x86/core/pcidirect.c +++ b/src/arch/x86/core/pcidirect.c @@ -34,8 +34,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); * @v where Location within PCI configuration space */ void pcidirect_prepare ( struct pci_device *pci, int where ) { - outl ( ( 0x80000000 | ( pci->bus << 16 ) | ( pci->devfn << 8 ) | - ( where & ~3 ) ), PCIDIRECT_CONFIG_ADDRESS ); + outl ( ( 0x80000000 | ( pci->busdevfn << 8 ) | ( where & ~3 ) ), + PCIDIRECT_CONFIG_ADDRESS ); } PROVIDE_PCIAPI_INLINE ( direct, pci_max_bus ); |