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/i386/interface/pcbios/pcibios.c | |
| parent | 00f5ba701fe1e43a28a15c5ffc626ce671ec65cb (diff) | |
| download | ipxe-f9b3fae8d46a6b1862b3f5b02490e5a8c224286f.tar.gz | |
[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/i386/interface/pcbios/pcibios.c')
| -rw-r--r-- | src/arch/i386/interface/pcbios/pcibios.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/arch/i386/interface/pcbios/pcibios.c b/src/arch/i386/interface/pcbios/pcibios.c index 4d09c054..9f69fe6e 100644 --- a/src/arch/i386/interface/pcbios/pcibios.c +++ b/src/arch/i386/interface/pcbios/pcibios.c @@ -73,7 +73,7 @@ int pcibios_read ( struct pci_device *pci, uint32_t command, uint32_t *value ){ : "=a" ( status ), "=b" ( discard_b ), "=c" ( *value ), "=D" ( discard_D ) : "a" ( command >> 16 ), "D" ( command ), - "b" ( PCI_BUSDEVFN ( pci->bus, pci->devfn ) ) + "b" ( pci->busdevfn ) : "edx" ); return ( ( status >> 8 ) & 0xff ); @@ -99,8 +99,7 @@ int pcibios_write ( struct pci_device *pci, uint32_t command, uint32_t value ){ : "=a" ( status ), "=b" ( discard_b ), "=c" ( discard_c ), "=D" ( discard_D ) : "a" ( command >> 16 ), "D" ( command ), - "b" ( PCI_BUSDEVFN ( pci->bus, pci->devfn ) ), - "c" ( value ) + "b" ( pci->busdevfn ), "c" ( value ) : "edx" ); return ( ( status >> 8 ) & 0xff ); |