diff options
author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-07-16 21:32:19 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-07-16 21:32:19 +0000 |
commit | 3834c2d7e5a08e09e580be0dc7f9369c941b2a70 (patch) | |
tree | 354156bfe1b3fb86e745287baf9602088c18bb14 /nicintel.c | |
parent | 6e48a026f7b57ecc4c2c7a8f9ce450db8f4b2a30 (diff) | |
download | ast2050-flashrom-3834c2d7e5a08e09e580be0dc7f9369c941b2a70.zip ast2050-flashrom-3834c2d7e5a08e09e580be0dc7f9369c941b2a70.tar.gz |
Check vendor_id for PCI based external programmers
Restructure PCI device detection code.
Rename pcidev_validate to pcidev_readbar.
Note: Slight changes in behaviour are possible, especially on dual/quad
chip NICs which appear as more than one PCI device. Found devices are no
longer printed at _pinfo level, but rather at _pdbg level.
Corresponding to flashrom svn r1548.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'nicintel.c')
-rw-r--r-- | nicintel.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -87,7 +87,7 @@ int nicintel_init(void) goto error_out_unmap; /* FIXME: Using pcidev_dev _will_ cause pretty explosions in the future. */ - addr = pcidev_validate(pcidev_dev, PCI_BASE_ADDRESS_0, nics_intel); + addr = pcidev_readbar(pcidev_dev, PCI_BASE_ADDRESS_0); /* FIXME: This is not an aligned mapping. Use 4k? */ nicintel_control_bar = physmap("Intel NIC control/status reg", addr, NICINTEL_CONTROL_MEMMAP_SIZE); |